update styles and minor reordering of nav
clean up layouts, rebuild