Nav Improvements