Improved UI a bit. whatever