layer selection usability fixes