Fix linked button issues