Worked some more on GUI