Cleaned up some code and edited user show page