css and html of welcome transferred
html and css copied
fixed conflicts