cleaning up
work in progress
Merge branch 'feature/menu_helper' into develop