more UI stuff
shit
merge