Added Mapping-set routes and layouts, also changed mapping routes (needs work)