#417 Some clean up.
#417 Clickable avatar, and some more clean up.