update positioning on welcome page
Fix merge conflicts
Merge pull request #100 from jjow/welcome_styling

Welcome styling