fix UnitID and buttons