Continuing content/polish

Furthering content for main/Display/Users, as well as overall polish to
code.