frontend fixes
merge