Fixed split action bar/mode theme and reorganised menus