Improved UI and added animation