Worked a little more on GUI