added remove buttons back