Fixing layer selection UI