Navigation overhaul, layout changes
Small style fix