Match current dev branch styling/menu organization