Fixed bug with edit/remove buttons