fixed some stuff with the navbar not making sense.
merging stuff