Added and reorganized lanes, platform, and shapes