Updated GUI, Deleted Classes