some clean up work and work on the settings fragment