Revert "rollback changes on nav-bar change"
Revert "rollback changes on nav-bar change"

This reverts commit b78f66531d3c2bc79f93e889e88371957e87973e.

Fr0stitute/Moreno-Construction,Fr0stitute/Moreno-Construction,Fr0stitute/Moreno-Construction,Fr0stitute/Moreno-Construction