Moved settings to sub-menu