More refactoring
Added several settings and began implemented in DashboardFragment.