Updated GUI class