Refactoring to use preference fragments (incomplete)