UI design improvements