Merge branch 'configuration'
Update default views
Add inner controllers and views