Cleaned up excess code around navbar