Fixes to layer rendering order and entity adding. Bit more work on new demo.