Remove excess variables
Use ImageButton for menu control