More changes
Merge pull request #36 from datboitom/settings-view

More changes