UI design updated