styled home page
fixed conflicts