Fixes to layers, clickable layer list exception

Tweaks to layers.xml, minor fixes to layer list.