Added code for remove option

VS Also seems to need to reorder the designer file