fixed bug with deplaced remove btn. clean ups