Improved UI and user game experience