Fixing layout maps+