Own mistake in refactor prior to commit to 'main' addon repo...

Also, some general cleanup (getting rid of stupid literal use of '20' as layer num everywhere!)
and fix for 'separator' in layers UI.