Added menu and settings