Improved UI further