CS-40 Added a SettingsActivity and button