Fixed removing layers and prepared for entity drawing