Improved UI a bit. Still a lot of work to be done.