Work on settings page
Merge pull request #161 from sammuel86/dev-0.3

Work on settings page style