remove buttons and bug fixes