Fixed a bug I pushed on last commit and eliminated unnecessary switch case in SettingsActivity