menu overhaul part1
nav bar done
merge