Adding more configuration views
Merge branch 'old_site'