Welcome and header styling
Merge in header and form styling and fix conflict