Renamed and fixed the order of some layers