Worked more on UI