Edited UI a bit