Map Skin & Minor adjustments