changed menu and added settings