restyling & views
fixed home link
fixing merge conflicts