Updated GUI Functionality