Weird everything changes commit
Tidying up some undeclared variables
Avatars were not clickable back to the user, fixed.