fixed home page view (temp fix)
fixed merge conflict on user home page