UI design enhanced