Worked on GUI a bit more