Improved settings pages
Merge branch 'master' of github.com:DDeis/Windmeal