Worked on gui stuff