Updated GUI and Fixed Other Bugs