Nav & Toolbar fixes