Improved UI and fixed various bugs