Changed UI a bit