More base functionallity

For the settings :D
Merge branch 'master' of https://github.com/CompraBV/onepage