Removed duplicate code from menu component / configuration
Make menu editable.
Merge branch 'master' into ESSENTIALS-166