added ui stuff
merge