left some buttons to fix
refactoring