More UI Stuff
fixed merge errors