Fix linked buttons and other fixes