New mappings for scotland office - working collapser and better tidymappings