More changes

User thingie and link thingie.