more UI changes!
merge