Addded settings, WebMap and several other things