Working more on UI