Started working on the UI