Completed Task #55 and #54

Remove button was created and set is removed during edit screens.