UI fixes
merge with origin