Refactoring : new methods, cleaner code
Switch from preferenceActivity to Fragment