Navigation overhaul, layout changes