added menu item changes and added user settings