navigation and extra pages, cleanup still to do