better naming on buttons and removed unused imports