in process homepage css
fixed conflicts