Edited the GUI and worked on event handlers