Fixes to nav