delete buttons and bug fixes