Improve Map size to take all available space