more UI stuff
merge