Made the GUI not suck. More changes coming,