Fix linked buttons and other fixes
Merge remote-tracking branch 'upstream/sass' into sass