fixed up settings and menuitem
merged