Minor changes to try and reduce memory
Minimized memory in routes by loading map as the cell expands
Merge remote-tracking branch 'origin/master'