front page redesign
Merge branch 'welcome_trial'