refactor menu options, pages etc: interim only