removed schedule from the nav bar, cleaned up the nav bar code
merged