26 refactor options in optionMenu snippet
Merge branch '26_NotificationRefactoring' into develop