Worked on UI and added lots of UI stuff