UI stuff
fixed merge conflicts