Move ActionMenu into ActionBar, clean up commented out code