Started working on ui