UI scalability fixes