Updated app layout and welcome views.
Merge pull request #2 from 3B7/modifying_html

Updated app layout and welcome views.
edit code changes. unmerged files. confusing branch problems