Added add and remove buttons, some bug fixes