Some fixes, settings and menu item files