Changed UI to look better (style, flow.)