Trying to make the layer select automatically
Merge branch 'UsabilityFixes'