Additional AppBar Fixes