Borders around all infrastructure and possible to place it
Refactoring of map drawing