Improved UI and added theme