ActionBar and Toggle Fixes
UI fixes