Clean Settings code and always use fragments