[#109] Clean up PreferencesActivity

* Handle TODOs