resolved conflict in show user and hard copied-and-pasted custom css from Chris's first commit