Apply & remove toppers correctly