Modified both files allowing full functionality of the GUI component