- Changed setting to PreferenceFragment rather than hacked linearlayout
- Refactoring