UI work, upgrade to OpenLayers 2.13