minor changes to users show view
resolved merging conflicts