Made UI a lot better
Minor UI changes