structured welcome_index
Merge branch 'feature'
fix make_up oof news