Quicklink changes

Ticket #276 - September 16