Worked on GUI class to separate into more methods