more consistant with bug fixes
added routers and more pages with a hack navbar fix