Move ActionBar items into the menu so the title is not truncated
Remove unused code