Initial work to have cleaner nav classes