- Completed map object layout refactoring