Added menu options and settings class