Minimal changes on UI

- Minimal changes on UI