navbar added
merging master and authentication