refactor menu for first login step