Major Edit to the navbar