Added a remove handler & button