Feature/map design