Got some stuff done with the navigation and menu stuff.