Tweak style
Implement alternate version with links

Also shows mixins on the case of the LinkStateMixin