Reconciliation and minor fixes to layers.xml/layer list