reorganized menu implementation in selfservice