updates to homepage
merge conflicts on user show view and index.html