rearranging nav
rearranging nav, merged with Dan's changes