Fixing layout maps++