wip, changed layout for welcome
fixed merge conflict on welcome