Even more ui tweaks

Made UI a lot cleaner.