added removal buttons, crappy, but working mostly :)