Add user links feature
Tidy product feature into contexts