refactor menu options, pages etc: done