Add remove button and some graphical improvements