CSS changes for welcome page
Resolved conflicts