Updated GUI but still basic