Changed UI a bit.