Fixing header nav bar
Cleaning up some naming
Improving look of upload page