h2h gui fixes
merge