some clean up work and work on the settings fragment
Merge pull request #36 from dvicini/master

some clean up work and work on the settings fragment