Lots of Updates for GUI

I'm sorry if i broke stuff