Updated GUI functionality