add/remove buttons working now.