fixed navbar, and upload bug