move more stuff to layout; start incorporating side nav
more nav work