some ui-action fixes