updated Loading, fixed Layers