#3 Improved layer selector UX/UI