refactor menus, make tab nav work in sidebar, tweaks to layouts