[IMP] Improve and fetch UI changes

- Improve and fetch UI changes