settings tabs updated and made into views
Merge branch 'master' of https://github.com/kristjant/Parim