Nav and layout enhancements