UI improvements
merge