Some prettification and renaming

navbar fix