Improved UI a bit