fix ui stuff
working version