edited forms for better understanding. checked for existence of user fields for show
fixed merge conflicts in users show and edit