Updated app layout and welcome views.
Merge branch 'modify-html'