Wip

Need to merge this branch and redeploy the harverster.
The map view has been improved and is now displayed almost instantly