Dropping 'willbelink' hack, and adjusting selectors.