Cleans up user show page
Fix merge conflict
Merge pull request #30 from ilanasufrin/ben_branch

Ben branch