UI design improvement