Improved UI

Improved UI