Need a new branch for main development
Added option to disable menu items