Fixed buttons not removed issue