working on users/show page
working on styling
merge