fixed small issues related to removing. fixed layout issues