new navbar upload and minor fixes