Better support for different layer sourced, particularly MapBox.  Fixed some issues with server loading.