Changes to fix navigation bar at top