Re-applied fix to navigation bar