#15 issue fixed --added changes (remove button)