Changed UI design a bit