Improved UI and the look and feel