Nest main layout 'yield' under <main>
Add basic welcome controller
Merge branch 'welcome-view'