edited item/edit form and user show page for profiles
more changes
fixed merge conflicts