Continued UI enhancement