Cleaned up nav bar and headers