diff --git a/client/App/App.js b/client/App/App.js
index a3cf9a9..3db92ef 100644
--- a/client/App/App.js
+++ b/client/App/App.js
@@ -71,6 +71,7 @@ Ext.application({
         'App.module.mission.controller.Mission',
         'App.module.mission.controller.MissionContextMenu',
         'App.module.mission.controller.MissionDetails',
+        'App.module.bnl.controller.Bnl',
         'App.module.kpi.controller.Kpi',
         'App.module.nm.controller.Nm',
         'App.module.main.controller.Main',
diff --git a/client/App/module/bnl/controller/Bnl.js b/client/App/module/bnl/controller/Bnl.js
new file mode 100644
index 0000000..be9f114
--- /dev/null
+++ b/client/App/module/bnl/controller/Bnl.js
@@ -0,0 +1,535 @@
+/**
+ * App.module.bnl.controller.Bnl
+ */
+Ext.define('App.module.bnl.controller.Bnl', {
+    extend: 'Ext.app.Controller',
+    requires: [
+        'App.util.Container',
+        'Clickenv.util.Hub' // @todo: Remove this in the future
+    ],
+    stores: [
+        'Bnl@App.module.bnl.store',
+        'Bnlcenter@App.module.bnl.store',
+        'Bnltype@App.module.bnl.store',
+        'UomHorizontal@App.module.bnl.store',
+        'UomVertical@App.module.bnl.store'
+    ],
+    refs: [{
+        ref: 'bnlPanel',
+        selector: 'Bnl'
+    }, {
+        ref: 'formPanel',
+        selector: 'Bnl BnlForm'
+    }, {
+        ref: 'gridPanel',
+        selector: 'Bnl BnlGrid'
+    }, {
+        ref: 'geomField',
+        selector: 'Bnl BnlForm GeometryField'
+    }, {
+        ref: 'geomFileField',
+        selector: 'Bnl BnlForm filefield[name=geomFile]'
+    }, {
+        ref: 'mapPanel',
+        selector: 'Bnl MapPanel'
+    }, {
+        ref: 'mapContextMenu',
+        selector: 'Bnl BnlContextMenu'
+    }],
+    init: function() {
+        this.control({
+            'Bnl': {
+                beforerender: App.alias(this, 'beforerender'),
+                afterrender: App.alias(this, 'afterrender')
+            },
+            'Bnl BnlGrid': {
+                selectionchange: App.alias(this, 'selectionchange')
+            },
+            'Bnl BnlForm': {
+                dirtychange: App.alias(this, 'dirtychange')
+            },
+            'Bnl BnlForm GeometryField': {
+                change: App.alias(this, 'updateEditFeature')
+            },
+            'Bnl BnlForm filefield[name=geomFile]': {
+                change: App.alias(this, 'loadGeomFile')
+            },
+            'Bnl button[name=reload]': {
+                click: App.alias(this, 'reload')
+            },
+            'Bnl button[name=create]': {
+                click: App.alias(this, 'create')
+            },
+            'Bnl button[name=copy]': {
+                click: App.alias(this, 'copy')
+            },
+            'Bnl button[name=remove]': {
+                click: App.alias(this, 'remove')
+            },
+            'Bnl button[name=add]': {
+                click: App.alias(this, 'save')
+            },
+            'Bnl button[name=save]': {
+                click: App.alias(this, 'save')
+            },
+            'Bnl button[name=cancel]': {
+                click: App.alias(this, 'cancel')
+            },
+            'Bnl button[name=print]': {
+                click: App.alias(this, 'print')
+            },
+            'Bnl BnlContextMenu menuitem[name=createCircle]': {
+                click: App.alias(this, 'createCircleFromContextMenu')
+            }
+        });
+        this.getStores().forEach(
+            function(store) {
+                store.getProxy().on({
+                    exception: App.alias(this, 'proxyException'),
+                    scope: this
+                });
+            },
+            this
+        );
+        this.getBnlStore().on({
+            datachanged: App.alias(this, 'datachanged'),
+            scope: this
+        });
+        // @todo: Replace this in the future
+        var me = this;
+        me.hub = Ext.create('Clickenv.util.Hub');
+        me.hub.subscribe('xmpp.message', function(msg) { me.servermessage(msg); });
+    },
+    beforerender: function() {
+        this.updateStates();
+        this.getStores().forEach(function(store) {
+            store.load();
+        });
+        // This is a workaround.
+        // @todo: Improve MapPanel to make the store optional
+        //        (and to set the Store via "store: 'BnlStore'" configuration, just like for grids and comboboxes)
+        this.getMapPanel().setStore(Ext.getStore('ext-empty-store'));
+        // This is a workaround.
+        // @todo: Improve MapPanel to make the context menu configurable
+        this.getMapPanel().addListeners = function() { this.addTimeControlListeners(); };
+        // @todo: Create map layers via clear
+        this.bnlStyleStrategy = Ext.create('Clickenv.util.OpenLayersFlexibleStyle', {
+            scope: this,
+            style: this.bnlStyle
+        });
+        this.bnlLayer = new OpenLayers.Layer.Vector(
+            'BNL',
+            {
+                strategies: [
+                    this.bnlStyleStrategy
+                ],
+                isBaseLayer: false,
+                visibility: true,
+                renderers: ['SVG'] // 'Canvas', 'SVG', 'SVG2', 'VML'
+            }
+        );
+        this.getMapPanel().map.addLayer(this.bnlLayer);
+        this.editStyleStrategy = Ext.create('Clickenv.util.OpenLayersFlexibleStyle', {
+            scope: this,
+            style: this.editStyle
+        });
+        this.editLayer = new OpenLayers.Layer.Vector(
+            'Edit',
+            {
+                strategies: [
+                    this.editStyleStrategy
+                ],
+                isBaseLayer: false,
+                visibility: true,
+                renderers: ['SVG'] // 'Canvas', 'SVG', 'SVG2', 'VML'
+            }
+        );
+        this.getMapPanel().map.addLayer(this.editLayer);
+    },
+    afterrender: function() {
+        this.getMapPanel().getEl().on({
+            scope: this,
+            contextmenu: App.alias(this, 'openMapContextMenu')
+        });
+    },
+    servermessage: function(msg) {
+        if (!this.getBnlPanel()) {
+            // Handle server messages only while the BNL tab is opened
+            return;
+        }
+        if (msg.bnlReload === true) {
+            this.reload();
+        }
+    },
+    selectionchange: function() {
+        if (this.getMode() === 'unselected' || this.getMode() === 'selectedClean') {
+            this.updateFormFromSelection();
+            this.bnlStyleStrategy.updateFeatures();
+            this.updateStates();
+        }
+    },
+    dirtychange: function() {
+        this.updateStates();
+    },
+    openMapContextMenu: function(event, target, eOpts) {
+        event.stopEvent();
+        this.mapContextPos = event.getXY();
+        this.getMapContextMenu().showAt(this.mapContextPos);
+    },
+    /**
+     * Workaround for a bug in ExtJS. See also:
+     * "Outdated selection after grid store reload."
+     * http://www.sencha.com/forum/showthread.php?261027-Outdated-selection-after-grid-store-reload
+     */
+    workaroundOutdatedSelection: function() {
+        if (this.getSelModel().hasSelection()) {
+            var selectedRecord = this.getSelModel().getLastSelected();
+            var correctRecord = this.getBnlStore().getAt(this.getBnlStore().indexOf(selectedRecord));
+            if (selectedRecord !== correctRecord) {
+                if (correctRecord === undefined) {
+                    this.getSelModel().deselectAll(true);
+                } else {
+                    this.getSelModel().deselectAll(true);
+                    this.getSelModel().select([correctRecord], false, true);
+                }
+            }
+        }
+    },
+    datachanged: function() {
+        this.workaroundOutdatedSelection();
+        if (this.getMode() === 'unselected' || this.getMode() === 'selectedClean' || this.getMode() === 'create') {
+            if (this.getMode() === 'unselected' || this.getMode() === 'selectedClean') {
+                this.updateFormFromSelection();
+            }
+            this.updateFeatures();
+            this.updateStates();
+        } else {
+            Ext.Msg.alert('Warning', 'Some information has changed while you are editing.');
+        }
+    },
+    updateFeatures: function() {
+        // @todo: var format = new OpenLayers.Format.GeoJSON({
+        var format = new OpenLayers.Format.WKT({
+            externalProjection: new OpenLayers.Projection('EPSG:4326'),
+            internalProjection: this.getMapPanel().map.getProjectionObject()
+        });
+        var features = [];
+        this.getBnlStore().each(function(record) {
+            var geom = record.get('geom');
+            if (geom !== null) {
+                // @todo: var feature = format.read(geom)[0];
+                var feature = format.read(geom);
+                feature.fid = record.getId();
+                features.push(feature);
+            }
+        });
+        this.bnlLayer.removeAllFeatures();
+        this.bnlLayer.addFeatures(features);
+    },
+    updateEditFeature: function() {
+        // @todo: Replace this with updateEditFeature_GeoJSON() in the future
+        var geom = this.getGeomField().getValue();
+        var format = new OpenLayers.Format.WKT({
+            externalProjection: new OpenLayers.Projection('EPSG:4326'),
+            internalProjection: this.getMapPanel().map.getProjectionObject()
+        });
+        var feature = format.read(geom);
+        this.editLayer.removeAllFeatures();
+        if (feature !== undefined) {
+            this.editLayer.addFeatures([feature]);
+        }
+    },
+    updateEditFeature_GeoJSON: function() {
+        var format = new OpenLayers.Format.GeoJSON({
+            externalProjection: new OpenLayers.Projection('EPSG:4326'),
+            internalProjection: this.getMapPanel().map.getProjectionObject()
+        });
+        var geom = this.getGeomField().getValue();
+        this.editLayer.removeAllFeatures();
+        if (geom !== null) {
+            this.editLayer.addFeatures(format.read(geom));
+        }
+    },
+    bnlStyle: function(feature) {
+        var record = this.getBnlStore().getById(feature.fid);
+        // @todo: Do we want really this?
+        if (record === this.getRecord()) {
+            return {display: 'none'};
+        }
+        var style = {};
+        style.strokeColor = '#666';
+        style.strokeWidth = 1;
+        style.fillColor = '#faa';
+        style.fillOpacity = 0.2;
+        style.pointRadius = 5;
+        style.graphicName = 'waypoint';
+        return style;
+    },
+    editStyle: function(feature) {
+        if (this.getMode() === 'unselected') {
+            return {display: 'none'};
+        }
+        var style = {};
+        style.strokeColor = '#000';
+        style.strokeWidth = 2;
+        style.fillColor = '#faa';
+        style.fillOpacity = 0.2;
+        style.pointRadius = 5;
+        style.graphicName = 'waypoint';
+        return style;
+    },
+    updateFormFromSelection: function() {
+        if (this.getSelModel().hasSelection()) {
+            this.getForm().loadRecord(this.getSelModel().getLastSelected());
+            this.getForm().reset();
+        } else {
+            this.getForm().loadRecord(Ext.create(this.getBnlStore().model));
+            this.getForm().reset(true);
+        }
+    },
+    proxyException: function() {
+        Ext.Msg.alert('Error', 'Unable to load or save data.');
+    },
+    loadGeomFile: function() {
+        // @todo: Move this method into a new widget class FileTextArea (textarea+filefield),
+        //        and use this as base class for GeometryField
+        var file = this.getGeomFileField().extractFileInput().files[0];
+        if (file === undefined) {
+            return;
+        }
+        var fileReader = new FileReader();
+        var me = this;
+        fileReader.onload = function() {
+            me.getGeomField().setValue(fileReader.result);
+        };
+        fileReader.readAsText(file);
+    },
+    create: function() {
+        this.getForm().loadRecord(Ext.create(this.getBnlStore().model));
+        this.bnlStyleStrategy.updateFeatures();
+        this.updateStates();
+        App.util.Container.focusFirstEditableField(this.getFormPanel());
+    },
+    copy: function() {
+        var record = this.getRecord();
+        Ext.Msg.show({
+            title: 'Copy',
+            msg: 'How many copies of entry ' + record.get('bnlnumber') + ' should be created?',
+            prompt: true,
+            value: '1',
+            icon: Ext.Msg.QUESTION,
+            buttons: Ext.Msg.OKCANCEL,
+            buttonText: {
+                ok: 'Copy'
+            },
+            scope: this,
+            fn: function(buttonId, text) {
+                if (buttonId === 'ok') {
+                    var count = this.parsePositiveInteger(text);
+                    if (count === null) {
+                        Ext.Msg.alert('Error', 'Invalid number of copies: ' + Ext.String.htmlEncode(text));
+                    } else {
+                        this.doCopy(record, count);
+                    }
+                }
+            }
+        });
+    },
+    doCopy: function(record, count) {
+        var newRecords = [];
+        for (var i = 0; i < count; i++) {
+            newRecords.push(this.getRecord().safeCopy());
+        }
+        this.getBnlStore().add(newRecords);
+        this.getSelModel().select([newRecords[0]]);
+    },
+    parsePositiveInteger: function(text) {
+        if (/^[1-9]\d*$/.test(text)) {
+            return parseInt(text);
+        } else {
+            return null;
+        }
+    },
+    remove: function() {
+        var record = this.getRecord();
+        Ext.Msg.show({
+            title: 'Confirmation',
+            msg: 'Entry ' + record.get('bnlnumber') + ' will be removed',
+            icon: Ext.Msg.WARNING,
+            buttons: Ext.Msg.OKCANCEL,
+            buttonText: {
+                ok: 'Remove'
+            },
+            scope: this,
+            fn: function(buttonId) {
+                if (buttonId === 'ok') {
+                    this.getBnlStore().remove(record);
+                    this.updateFormFromSelection();
+                    this.updateStates();
+                }
+            }
+        });
+    },
+    save: function() {
+        if (!this.getForm().isValid()) {
+            return;
+        }
+        var mode = this.getMode();
+        var values = this.getForm().getFieldValues();
+        var record = this.getRecord();
+        for (var name in values) {
+            if (!record.fields.containsKey(name)) {
+                Ext.Error.raise('Form field not present in model: ' + name);
+            }
+        }
+        record.beginEdit();
+        record.set(values);
+        var errors = record.validate();
+        if (errors.isValid()) {
+            record.endEdit();
+            if (mode === 'create') {
+                this.getForm().reset();
+                this.getBnlStore().add(record);
+                this.getSelModel().select([record]);
+            } else { // mode === 'selectedClean'
+                this.triggerPendingReload();
+                this.updateFormFromSelection();
+            }
+            this.updateStates();
+        } else {
+            record.cancelEdit();
+            this.getForm().markInvalid(errors);
+        }
+    },
+    cancel: function() {
+        this.triggerPendingReload();
+        this.updateFormFromSelection();
+        this.updateStates();
+    },
+    print: function() {
+        Ext.Msg.alert('Error', 'Not yet implemented');
+    },
+    createCircleFromContextMenu: function() {
+        var center = this.pixelToMapPoint(this.mapContextPos, this.getMapPanel().map);
+        this.createCircleFromCenter(center);
+    },
+    createCircleFromCenter: function(center) {
+        Ext.Msg.show({
+            title: 'Create Circle',
+            msg: 'Radius of circle in meters:',
+            prompt: true,
+            value: '10000',
+            icon: Ext.Msg.QUESTION,
+            buttons: Ext.Msg.OKCANCEL,
+            buttonText: {
+                ok: 'Create'
+            },
+            scope: this,
+            fn: function(buttonId, text) {
+                if (buttonId === 'ok') {
+                    var radius = parseFloat(text);
+                    this.createCircle(center, radius);
+                }
+            }
+        });
+    },
+    createCircle: function(center, radius) {
+        Ext.Ajax.request({
+            url: 'app/bnl/interpolatecircle',
+            timeout: 1000, // 1 second (actually, the request should not take longer than 0.1 seconds)
+            method: 'GET',
+            params: {
+                // @todo: Use GeoJSON instead of WKT in the future
+                // center: Ext.encode(center)
+                center: center,
+                radius: radius
+            },
+            scope: this,
+            success: function(response) {
+                // @todo: Use GeoJSON in the future
+                // var geom = Ext.decode(response.responseText);
+                // this.getGeomField().setValue(JSON.stringify(geom, null, 2));
+                this.getGeomField().setValue(new OpenLayers.Format.GeoJSON().read(response.responseText)[0].geometry.toString());
+            },
+            failure: function(response) {
+                Ext.Msg.alert('Error', 'Interpolation of circle failed.');
+            }
+        });
+    },
+    /**
+     * Convert pixel coordinates of the mouse to geographic point coordinates of the map.
+     *
+     * Returns WKT.
+     *
+     * @todo: Return GeoJSON in the future
+     */
+    pixelToMapPoint: function(pixelPos, map) {
+        var mapPos = Ext.fly(map.viewPortDiv).getXY();
+        var pos = new OpenLayers.Pixel(pixelPos[0] - mapPos[0], pixelPos[1] - mapPos[1]);
+        // This is does not calculate lon/lat, but the map coordinates in the current map projection
+        var lonLat = map.getLonLatFromPixel(pos);
+        var point = new OpenLayers.Geometry.Point(lonLat.lon, lonLat.lat);
+        var sourceProjection = this.getMapPanel().map.getProjectionObject();
+        var destProjection = new OpenLayers.Projection('EPSG:4326');
+        point.transform(sourceProjection, destProjection);
+        // @todo: Return GeoJSON in the future
+        // return new OpenLayers.Format.GeoJSON().write(point);
+        return point.toString();
+    },
+    getMode: function() {
+        if (this.getRecord() === undefined) {
+            return 'unselected';
+        } else if (this.getBnlStore().data.contains(this.getRecord())) {
+            if (this.getForm().isDirty()) {
+                return 'selectedDirty';
+            } else {
+                return 'selectedClean';
+            }
+        } else {
+            return 'create';
+        }
+    },
+    updateStates: function() {
+        App.util.Container.applyMode(this.getBnlPanel(), this.getMode());
+    },
+    /**
+     * Whether there is currently a peding reload scheduled
+     */
+    pendingReload: false,
+    /**
+     * Reload immediately if possible, otherwise schedule peding reload
+     */
+    reload: function() {
+        var mode = this.getMode();
+        if (mode === 'unselected' || mode === 'selectedClean' || mode === 'create') {
+            if (mode === 'unselected' || mode === 'selectedClean') {
+                this.getForm().reset(true);
+            }
+            this.getBnlStore().reload();
+        } else if (!this.pendingReload) {
+            this.pendingReload = true;
+            Ext.Msg.alert('Warning', 'Some information has changed on server side while you are editing. It will be reloaded as soon as you save or cancel.');
+        }
+    },
+    /**
+     * Trigger pending reload, if a pending reload was scheduled.
+     */
+    triggerPendingReload: function() {
+        if (this.pendingReload) {
+            this.pendingReload = false;
+            this.getBnlStore().reload();
+        }
+    },
+    getForm: function() {
+        return this.getFormPanel().getForm();
+    },
+    getRecord: function() {
+        return this.getForm().getRecord();
+    },
+    getSelModel: function() {
+        return this.getGridPanel().getSelectionModel();
+    },
+    getStores: function() {
+        return this.stores.map(this.getStore, this);
+    }
+});
diff --git a/client/App/module/bnl/model/Bnl.js b/client/App/module/bnl/model/Bnl.js
new file mode 100644
index 0000000..3ea5fd0
--- /dev/null
+++ b/client/App/module/bnl/model/Bnl.js
@@ -0,0 +1,199 @@
+/**
+ * App.module.bnl.model.Bnl
+ */
+Ext.define('App.module.bnl.model.Bnl', {
+    extend: 'Ext.data.Model',
+    requires: [
+        'Ext.data.SequentialIdGenerator'
+    ],
+    idProperty: 'bnl_id',
+    fields: [{
+        name: 'bnl_id',
+        noCopy: true
+    }, {
+        name: 'year',
+        type: 'integer',
+        useNull: true
+    }, {
+        name: 'bnlnumber',
+        type: 'integer',
+        useNull: true,
+        noCopy: true
+    }, {
+        name: 'center',
+        type: 'string',
+        defaultValue: 'EDGG'
+    }, {
+        name: 'bnltype',
+        type: 'string'
+    }, {
+        name: 'valid_begin',
+        type: 'date',
+        dateFormat: 'c'
+    }, {
+        name: 'valid_end',
+        type: 'date',
+        dateFormat: 'c'
+    }, {
+        name: 'mapname',
+        type: 'string'
+    }, {
+        name: 'geom',
+        type: 'NonemptyString'
+    }, {
+        name: 'lower_value',
+        type: 'integer',
+        useNull: true
+    }, {
+        name: 'lower_uom',
+        type: 'NonemptyString'
+    }, {
+        name: 'upper_value',
+        type: 'integer',
+        useNull: true
+    }, {
+        name: 'upper_uom',
+        type: 'NonemptyString'
+    }, {
+        name: 'sep_value',
+        type: 'integer',
+        useNull: true
+    }, {
+        name: 'sep_uom',
+        type: 'NonemptyString'
+    }, {
+        name: 'contact',
+        type: 'string'
+    }, {
+        name: 'company',
+        type: 'string'
+    }, {
+        name: 'address',
+        type: 'string'
+    }, {
+        name: 'fax',
+        type: 'string'
+    }, {
+        name: 'email',
+        type: 'string'
+    }, {
+        name: 'phone',
+        type: 'string'
+    }, {
+        name: 'phone_avail',
+        type: 'string'
+    }, {
+        name: 'departure',
+        type: 'string'
+    }, {
+        name: 'destination',
+        type: 'string'
+    }, {
+        name: 'aircraft',
+        type: 'string'
+    }, {
+        name: 'pjetype',
+        type: 'string'
+    }, {
+        name: 'dropoff',
+        type: 'integer',
+        useNull: true
+    }, {
+        name: 'parachute',
+        type: 'integer',
+        useNull: true
+    }, {
+        name: 'reference',
+        type: 'string'
+    }, {
+        name: 'sector',
+        type: 'string'
+    }, {
+        name: 'reported_fis',
+        type: 'boolean'
+    }, {
+        name: 'reported_stca',
+        type: 'boolean'
+    }, {
+        name: 'reported_assistant',
+        type: 'boolean'
+    }, {
+        name: 'reported_twr',
+        type: 'boolean'
+    }, {
+        name: 'reported_sectors',
+        type: 'boolean'
+    }, {
+        name: 'comment',
+        type: 'string'
+    }],
+    validations: [
+        {type: 'presence', field: 'year'},
+        {type: 'presence', field: 'center'},
+        {type: 'presence', field: 'bnltype'},
+        {type: 'presence', field: 'valid_begin'},
+        {type: 'presence', field: 'valid_end'}
+    ],
+    validate: function() {
+        var errors = this.callParent();
+
+        var beginField = 'valid_begin';
+        var endField = 'valid_end';
+        if (!this.validateBeginEnd(beginField, endField)) {
+            errors.add({
+                field: endField,
+                message: 'is not after begin'
+            });
+        }
+
+        return errors;
+    },
+    validateBeginEnd: function(beginField, endField) {
+        var errors = Ext.create('Ext.data.Errors');
+        var beginValue = this.get(beginField);
+        var endValue = this.get(endField);
+        if (Ext.isDate(beginValue) && Ext.isDate(endValue)) {
+            return beginValue.getTime() < endValue.getTime();
+        } else {
+            return true;
+        }
+    },
+    safeCopy: function() {
+        var me = this;
+        var convertedData = {};
+        me.fields.each(function(field) {
+            if (!field.noCopy) {
+                var name = field.name;
+                convertedData[name] = me.get(name);
+            }
+        });
+        // See constructor documentation of Ext.data.Model
+        return new me.self(null, null, null, convertedData);
+    }
+}, function() {
+    /**
+     * Dynamic default values
+     */
+    Object.defineProperty(
+        App.module.bnl.model.Bnl.prototype.fields.getByKey('valid_begin'),
+        'defaultValue',
+        {
+            get: function() {
+                return Ext.Date.parse(Ext.Date.format(new Date(), 'Y-m-d'), 'Y-m-d', true);
+            },
+            set: function(newValue) {
+            }
+        }
+    );
+    Object.defineProperty(
+        App.module.bnl.model.Bnl.prototype.fields.getByKey('valid_end'),
+        'defaultValue',
+        {
+            get: function() {
+                return Ext.Date.add(Ext.Date.parse(Ext.Date.format(new Date(), 'Y-m-d'), 'Y-m-d', true), Ext.Date.DAY, +1);
+            },
+            set: function(newValue) {
+            }
+        }
+    );
+});
diff --git a/client/App/module/bnl/model/Bnlcenter.js b/client/App/module/bnl/model/Bnlcenter.js
new file mode 100644
index 0000000..e257130
--- /dev/null
+++ b/client/App/module/bnl/model/Bnlcenter.js
@@ -0,0 +1,14 @@
+/**
+ * App.module.bnl.model.Bnlcenter
+ */
+Ext.define('App.module.bnl.model.Bnlcenter', {
+    extend: 'Ext.data.Model',
+    idProperty: 'center',
+    fields: [{
+        name: 'center',
+        type: 'string'
+    }, {
+        name: 'center_label',
+        type: 'string'
+    }]
+});
diff --git a/client/App/module/bnl/model/Bnltype.js b/client/App/module/bnl/model/Bnltype.js
new file mode 100644
index 0000000..79f6ed2
--- /dev/null
+++ b/client/App/module/bnl/model/Bnltype.js
@@ -0,0 +1,14 @@
+/**
+ * App.module.bnl.model.Bnltype
+ */
+Ext.define('App.module.bnl.model.Bnltype', {
+    extend: 'Ext.data.Model',
+    idProperty: 'bnltype',
+    fields: [{
+        name: 'bnltype',
+        type: 'string'
+    }, {
+        name: 'description',
+        type: 'string'
+    }]
+});
diff --git a/client/App/module/bnl/model/UomHorizontal.js b/client/App/module/bnl/model/UomHorizontal.js
new file mode 100644
index 0000000..6f4b794
--- /dev/null
+++ b/client/App/module/bnl/model/UomHorizontal.js
@@ -0,0 +1,11 @@
+/**
+ * App.module.bnl.model.UomHorizontal
+ */
+Ext.define('App.module.bnl.model.UomHorizontal', {
+    extend: 'Ext.data.Model',
+    idProperty: 'uom_horizontal',
+    fields: [{
+        name: 'uom_horizontal',
+        type: 'string'
+    }]
+});
diff --git a/client/App/module/bnl/model/UomVertical.js b/client/App/module/bnl/model/UomVertical.js
new file mode 100644
index 0000000..0d9d077
--- /dev/null
+++ b/client/App/module/bnl/model/UomVertical.js
@@ -0,0 +1,11 @@
+/**
+ * App.module.bnl.model.UomVertical
+ */
+Ext.define('App.module.bnl.model.UomVertical', {
+    extend: 'Ext.data.Model',
+    idProperty: 'uom_vertical',
+    fields: [{
+        name: 'uom_vertical',
+        type: 'string'
+    }]
+});
diff --git a/client/App/module/bnl/store/Bnl.js b/client/App/module/bnl/store/Bnl.js
new file mode 100644
index 0000000..46f62f1
--- /dev/null
+++ b/client/App/module/bnl/store/Bnl.js
@@ -0,0 +1,32 @@
+/**
+ * App.module.bnl.store.Bnl
+ */
+Ext.define('App.module.bnl.store.Bnl', {
+    extend: 'Ext.data.Store',
+    model: 'App.module.bnl.model.Bnl',
+    pageSize: 25,
+    autoSync: true,
+    proxy: {
+        type: 'ajax',
+        extraParams: {
+            table: 'bnl'
+        },
+        api: {
+            create: 'app/bnl/create',
+            read: 'app/bnl/read',
+            update: 'app/bnl/update',
+            destroy: 'app/bnl/delete'
+        },
+        reader: {
+            type: 'json',
+            root: 'bnl'
+        }
+    },
+    sorters: [{
+        property: 'year',
+        direction: 'ASC'
+    }, {
+        property: 'number',
+        direction: 'ASC'
+    }]
+});
diff --git a/client/App/module/bnl/store/Bnlcenter.js b/client/App/module/bnl/store/Bnlcenter.js
new file mode 100644
index 0000000..4e5621f
--- /dev/null
+++ b/client/App/module/bnl/store/Bnlcenter.js
@@ -0,0 +1,21 @@
+/**
+ * App.module.bnl.store.Bnlcenter
+ */
+Ext.define('App.module.bnl.store.Bnlcenter', {
+    extend: 'Ext.data.Store',
+    model: 'App.module.bnl.model.Bnlcenter',
+    pageSize: 1000,
+    proxy: {
+        type: 'ajax',
+        extraParams: {
+            table: 'bnlcenter'
+        },
+        api: {
+            read: 'app/bnl/read'
+        },
+        reader: {
+            type: 'json',
+            root: 'bnlcenter'
+        }
+    }
+});
diff --git a/client/App/module/bnl/store/Bnltype.js b/client/App/module/bnl/store/Bnltype.js
new file mode 100644
index 0000000..92e3ffc
--- /dev/null
+++ b/client/App/module/bnl/store/Bnltype.js
@@ -0,0 +1,21 @@
+/**
+ * App.module.bnl.store.Bnltype
+ */
+Ext.define('App.module.bnl.store.Bnltype', {
+    extend: 'Ext.data.Store',
+    model: 'App.module.bnl.model.Bnltype',
+    pageSize: 1000,
+    proxy: {
+        type: 'ajax',
+        extraParams: {
+            table: 'bnltype'
+        },
+        api: {
+            read: 'app/bnl/read'
+        },
+        reader: {
+            type: 'json',
+            root: 'bnltype'
+        }
+    }
+});
diff --git a/client/App/module/bnl/store/UomHorizontal.js b/client/App/module/bnl/store/UomHorizontal.js
new file mode 100644
index 0000000..921ffc1
--- /dev/null
+++ b/client/App/module/bnl/store/UomHorizontal.js
@@ -0,0 +1,21 @@
+/**
+ * App.module.bnl.store.UomHorizontal
+ */
+Ext.define('App.module.bnl.store.UomHorizontal', {
+    extend: 'Ext.data.Store',
+    model: 'App.module.bnl.model.UomHorizontal',
+    pageSize: 1000,
+    proxy: {
+        type: 'ajax',
+        extraParams: {
+            table: 'uom_horizontal'
+        },
+        api: {
+            read: 'app/bnl/read'
+        },
+        reader: {
+            type: 'json',
+            root: 'uom_horizontal'
+        }
+    }
+});
diff --git a/client/App/module/bnl/store/UomVertical.js b/client/App/module/bnl/store/UomVertical.js
new file mode 100644
index 0000000..0b98924
--- /dev/null
+++ b/client/App/module/bnl/store/UomVertical.js
@@ -0,0 +1,21 @@
+/**
+ * App.module.bnl.store.UomVertical
+ */
+Ext.define('App.module.bnl.store.UomVertical', {
+    extend: 'Ext.data.Store',
+    model: 'App.module.bnl.model.UomVertical',
+    pageSize: 1000,
+    proxy: {
+        type: 'ajax',
+        extraParams: {
+            table: 'uom_vertical'
+        },
+        api: {
+            read: 'app/bnl/read'
+        },
+        reader: {
+            type: 'json',
+            root: 'uom_vertical'
+        }
+    }
+});
diff --git a/client/App/module/bnl/view/Bnl.js b/client/App/module/bnl/view/Bnl.js
new file mode 100644
index 0000000..a544b9d
--- /dev/null
+++ b/client/App/module/bnl/view/Bnl.js
@@ -0,0 +1,127 @@
+/**
+ * App.module.bnl.view.Bnl
+ */
+Ext.define('App.module.bnl.view.Bnl', {
+    extend: 'Ext.Panel',
+    alias: ['widget.Bnl'],
+    requires: [
+        'App.module.bnl.view.BnlForm',
+        'App.module.bnl.view.BnlGrid',
+        'App.module.bnl.view.BnlContextMenu',
+        'App.widget.map.MapPanel'
+    ],
+    layout: 'border',
+    border: false,
+    tbar: [{
+        xtype: 'buttongroup',
+        title: 'Filter',
+        disabledInModes: ['create', 'selectedDirty'],
+        items: [{
+            text: 'Reload',
+            xtype: 'datefield',
+            width: 90,
+            name: 'filterDate'
+        }, {
+            text: 'Reload',
+            icon: 'App/resources/images/icons/arrow_refresh.png',
+            name: 'reload'
+        }],
+        name: 'filter'
+    }, {
+        xtype: 'buttongroup',
+        title: 'Entry',
+        disabledInModes: ['create', 'selectedDirty'],
+        items: [{
+            text: 'New',
+            icon: 'App/resources/images/icons/add.png',
+            name: 'create'
+        }, {
+            text: 'Copy',
+            disabledInModes: ['create', 'selectedDirty', 'unselected'],
+            icon: 'App/resources/images/icons/arrow_divide.png',
+            name: 'copy'
+        }, {
+            text: 'Remove',
+            disabledInModes: ['create', 'selectedDirty', 'unselected'],
+            icon: 'App/resources/images/icons/delete.png',
+            name: 'remove'
+        }],
+        name: 'entry'
+    }, {
+        xtype: 'buttongroup',
+        title: 'Create',
+        hiddenInModes: ['selectedClean', 'selectedDirty', 'unselected'],
+        items: [{
+            text: 'Add',
+            icon: 'App/resources/images/icons/add.png',
+            name: 'add'
+        }, {
+            text: 'Cancel',
+            icon: 'App/resources/images/icons/reject.png',
+            name: 'cancel'
+        }],
+        name: 'create'
+    }, {
+        xtype: 'buttongroup',
+        title: 'Edit',
+        hiddenInModes: ['create', 'selectedClean', 'unselected'],
+        items: [{
+            text: 'Save',
+            icon: 'App/resources/images/icons/disk.png',
+            name: 'save'
+        }, {
+            text: 'Cancel',
+            icon: 'App/resources/images/icons/reject.png',
+            name: 'cancel'
+        }],
+        name: 'edit'
+    }, {
+        xtype: 'tbfill'
+    }, {
+        xtype: 'buttongroup',
+        title: 'Export',
+        disabledInModes: ['create', 'selectedDirty', 'unselected'],
+        items: [{
+            text: 'Print',
+            icon: 'App/resources/images/icons/printer.png',
+            name: 'print'
+        }],
+        name: 'export'
+    }],
+    items: [{
+        xtype: 'BnlContextMenu'
+    }, {
+        region: 'center',
+        layout: 'border',
+        border: false,
+        items: [{
+            region: 'west',
+            split: true,
+            collapsible: true,
+            collapseMode: 'header',
+            title: 'Form',
+            width: 300,
+            border: false,
+            layout: 'fit',
+            items: [{
+                xtype: 'BnlForm'
+            }]
+        }, {
+            region: 'center',
+            title: 'List',
+            border: false,
+            layout: 'fit',
+            items: [{
+                xtype: 'BnlGrid'
+            }]
+        }, {
+            region: 'east',
+            split: true,
+            collapsible: true,
+            collapseMode: 'header',
+            title: 'Map',
+            width: 500,
+            xtype: 'MapPanel'
+        }]
+    }]
+});
diff --git a/client/App/module/bnl/view/BnlContextMenu.js b/client/App/module/bnl/view/BnlContextMenu.js
new file mode 100644
index 0000000..fd90f3a
--- /dev/null
+++ b/client/App/module/bnl/view/BnlContextMenu.js
@@ -0,0 +1,12 @@
+/**
+ * Context menu for the BNL map.
+ */
+Ext.define('App.module.bnl.view.BnlContextMenu', {
+    extend: 'Ext.menu.Menu',
+    alias: ['widget.BnlContextMenu'],
+    items: [{
+        text: 'Create Circle',
+        disabledInModes: ['unselected'],
+        name: 'createCircle'
+    }]
+});
diff --git a/client/App/module/bnl/view/BnlForm.js b/client/App/module/bnl/view/BnlForm.js
new file mode 100644
index 0000000..0f0e19e
--- /dev/null
+++ b/client/App/module/bnl/view/BnlForm.js
@@ -0,0 +1,233 @@
+/**
+ * App.module.bnl.view.BnlForm
+ */
+Ext.define('App.module.bnl.view.BnlForm', {
+    extend: 'Ext.form.Panel',
+    alias: ['widget.BnlForm'],
+    requires: [
+        'App.widget.DateTimeFieldBnl',
+        'App.widget.GeometryField'
+    ],
+    disabledInModes: ['unselected'],
+    trackResetOnLoad: true,
+    overflowY: 'scroll',
+    items: [{
+        xtype: 'fieldset',
+        title: 'General',
+        items: [{
+            xtype: 'displayfield',
+            fieldLabel: 'Year',
+            disabledInModes: ['create'],
+            hiddenInModes: ['create'],
+            name: 'year'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'Year',
+            disabledInModes: ['selectedClean', 'selectedDirty', 'unselected'],
+            hiddenInModes: ['selectedClean', 'selectedDirty', 'unselected'],
+            name: 'year'
+        }, {
+            xtype: 'displayfield',
+            fieldLabel: 'Number',
+            name: 'bnlnumber'
+        }, {
+            xtype: 'combobox',
+            fieldLabel: 'Center',
+            forceSelection: true,
+            queryMode: 'local',
+            store: 'Bnlcenter',
+            valueField: 'center',
+            displayField: 'center_label',
+            name: 'center'
+        }, {
+            xtype: 'combobox',
+            fieldLabel: 'Type',
+            forceSelection: true,
+            queryMode: 'local',
+            store: 'Bnltype',
+            valueField: 'bnltype',
+            displayField: 'description',
+            name: 'bnltype'
+        }]
+    }, {
+        xtype: 'fieldset',
+        title: 'Time',
+        items: [{
+            xtype: 'DateTimeFieldBnl',
+            fieldLabel: 'Begin (UTC)',
+            rangeType: 'begin',
+            name: 'valid_begin'
+        }, {
+            xtype: 'DateTimeFieldBnl',
+            fieldLabel: 'End (UTC)',
+            rangeType: 'end',
+            name: 'valid_end'
+        }]
+    }, {
+        xtype: 'fieldset',
+        title: 'Location',
+        items: [{
+            xtype: 'textfield',
+            fieldLabel: 'Map/ID name',
+            name: 'mapname'
+        }, {
+            xtype: 'GeometryField',
+            fieldLabel: 'Geometry',
+            name: 'geom'
+        }, {
+            xtype: 'filefield',
+            fieldLabel: 'File',
+            name: 'geomFile'
+        }, {
+            xtype: 'fieldcontainer',
+            fieldLabel: 'Min height',
+            layout: 'hbox',
+            items: [{
+                xtype: 'textfield',
+                width: 60,
+                name: 'lower_value'
+            }, {
+                xtype: 'combobox',
+                width: 60,
+                queryMode: 'local',
+                store: 'UomVertical',
+                valueField: 'uom_vertical',
+                displayField: 'uom_vertical',
+                name: 'lower_uom'
+            }]
+        }, {
+            xtype: 'fieldcontainer',
+            fieldLabel: 'Max height',
+            layout: 'hbox',
+            items: [{
+                xtype: 'textfield',
+                width: 60,
+                name: 'upper_value'
+            }, {
+                xtype: 'combobox',
+                width: 60,
+                queryMode: 'local',
+                store: 'UomVertical',
+                valueField: 'uom_vertical',
+                displayField: 'uom_vertical',
+                name: 'upper_uom'
+            }]
+        }, {
+            xtype: 'fieldcontainer',
+            fieldLabel: 'Separation buffer',
+            layout: 'hbox',
+            items: [{
+                xtype: 'textfield',
+                width: 60,
+                name: 'sep_value'
+            }, {
+                xtype: 'combobox',
+                width: 60,
+                queryMode: 'local',
+                store: 'UomHorizontal',
+                valueField: 'uom_horizontal',
+                displayField: 'uom_horizontal',
+                name: 'sep_uom'
+            }]
+        }]
+    }, {
+        xtype: 'fieldset',
+        title: 'Contact',
+        items: [{
+            xtype: 'textfield',
+            fieldLabel: 'Name',
+            name: 'contact'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'Company / Aerodrome',
+            name: 'company'
+        }, {
+            xtype: 'textarea',
+            fieldLabel: 'Address',
+            height: 40,
+            rows: 2,
+            name: 'address'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'Fax',
+            name: 'fax'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'Email',
+            name: 'email'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'Phone',
+            name: 'phone'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'Always available',
+            name: 'phone_avail'
+        }]
+    }, {
+        xtype: 'fieldset',
+        title: 'Specific',
+        items: [{
+            xtype: 'textfield',
+            fieldLabel: 'Departure',
+            name: 'departure'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'Destination',
+            name: 'destination'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'Aircraft',
+            name: 'aircraft'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'PJE type',
+            name: 'pjetype'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'Drop offs',
+            name: 'dropoff'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'Parachutes',
+            name: 'parachute'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'Reference',
+            name: 'reference'
+        }, {
+            xtype: 'textfield',
+            fieldLabel: 'Sector',
+            name: 'sector'
+        }, {
+            xtype: 'checkboxgroup',
+            fieldLabel: 'Reported',
+            columns: 2,
+            items: [{
+                boxLabel: 'FIS',
+                name: 'reported_fis'
+            }, {
+                boxLabel: 'STCA',
+                name: 'reported_stca'
+            }, {
+                boxLabel: 'Assistant',
+                name: 'reported_assistant'
+            }, {
+                boxLabel: 'TWR',
+                name: 'reported_twr'
+            }, {
+                boxLabel: 'Sectors',
+                name: 'reported_sectors'
+            }]
+        }]
+    }, {
+        xtype: 'fieldset',
+        title: 'Misc',
+        items: [{
+            xtype: 'textarea',
+            fieldLabel: 'Comment',
+            height: 100,
+            name: 'comment'
+        }]
+    }]
+});
diff --git a/client/App/module/bnl/view/BnlGrid.js b/client/App/module/bnl/view/BnlGrid.js
new file mode 100644
index 0000000..593734b
--- /dev/null
+++ b/client/App/module/bnl/view/BnlGrid.js
@@ -0,0 +1,57 @@
+/**
+ * App.module.bnl.view.BnlGrid
+ */
+Ext.define('App.module.bnl.view.BnlGrid', {
+    extend: 'Ext.grid.Panel',
+    alias: ['widget.BnlGrid'],
+    requires: [],
+    store: 'Bnl',
+    disabledInModes: ['create', 'selectedDirty'],
+    columns: [{
+        header: 'Year',
+        dataIndex: 'year',
+        width: 60
+    }, {
+        header: 'Center',
+        dataIndex: 'center',
+        renderer: function(value) {
+            var record = Ext.getStore('Bnlcenter').getById(value);
+            return record === null ? null : record.get('center_label');
+        },
+        width: 60
+    }, {
+        header: 'Number',
+        dataIndex: 'bnlnumber',
+        width: 60
+    }, {
+        header: 'Type',
+        dataIndex: 'bnltype',
+        width: 80
+    }, {
+        header: 'Begin',
+        xtype: 'datecolumn',
+        dataIndex: 'valid_begin',
+        format: 'Y-m-d\u2002H:i', // U+2002 = EN SPACE
+        width: 105
+    }, {
+        header: 'End',
+        hidden: true,
+        xtype: 'datecolumn',
+        dataIndex: 'valid_end',
+        format: 'Y-m-d\u2002H:i', // U+2002 = EN SPACE
+        width: 105
+    }, {
+        header: 'Geom',
+        width: 40,
+        dataIndex: 'geom',
+        editable: false,
+        align: 'center',
+        xtype: 'booleancolumn',
+        trueText: '\u2612', // U+2612 = BALLOT BOX WITH X (☒)
+        falseText: '\u2610' // U+2610 = BALLOT BOX (☐)
+    }, {
+        header: 'Comment',
+        dataIndex: 'comment',
+        flex: 1
+    }]
+});
diff --git a/client/App/module/main/view/Login.js b/client/App/module/main/view/Login.js
index af0c6eb..e4850f7 100644
--- a/client/App/module/main/view/Login.js
+++ b/client/App/module/main/view/Login.js
@@ -20,8 +20,7 @@ Ext.define('App.module.main.view.Login', {
             html: '<div id="login-bg-panel">' +
                 '<div style="font: bold 1.6em Verdana, Arial, sans-serif; color: white" class="login-benefits login-abs-position">' +
                 '<p>' +
-                'STANLY_ACOS 2<br>' +
-                'Airspace Management Tool' +
+                'BNL Prototype' +
                 '</p>' +
                 '<p style="font-weight: bold; color: #000; background-color: #f88;" id="login-error"></p>' +
                 '</div>' +
diff --git a/client/App/module/main/view/Menu.js b/client/App/module/main/view/Menu.js
index ec99389..04af54c 100644
--- a/client/App/module/main/view/Menu.js
+++ b/client/App/module/main/view/Menu.js
@@ -7,6 +7,7 @@ Ext.define('App.module.main.view.Menu', {
     requires: [
         'App.module.abd.view.AbdPanel',
         'App.module.mission.view.MissionPanel',
+        'App.module.bnl.view.Bnl',
         'App.module.kpi.view.KpiPanel',
         'App.module.nm.view.NmPanel',
         'App.module.sysadmin.view.Sysadmin',
@@ -64,6 +65,13 @@ Ext.define('App.module.main.view.Menu', {
                 xtype: 'Mission'
             }
         }, {
+            name: 'Bnl',
+            text: 'BNL',
+            permission: 'bnl',
+            tab: {
+                xtype: 'Bnl'
+            }
+        }, {
             name: 'Kpi',
             text: 'KPI',
             permission: 'monitor',
diff --git a/client/App/module/main/view/Viewport.js b/client/App/module/main/view/Viewport.js
index bc947f6..207ec30 100644
--- a/client/App/module/main/view/Viewport.js
+++ b/client/App/module/main/view/Viewport.js
@@ -34,12 +34,12 @@ Ext.define('App.module.main.view.Viewport', {
             data: {},
             cls: 'mc-bg-white',
             tpl: [
-                '<div class="logo">STANLY_ACOS 2</div>',
+                '<div class="logo">BNL Prototype</div>',
                 '<div class="logo-right-container">',
                 '    <div class="logo-right-top">',
                 '        <div class="version {environment}">{branch}</div>',
                 '    </div>',
-                '    <div class="app-title">Airspace Management Tool</div>',
+                '    <div class="app-title">STANLY_ACOS 2 Airspace Management Tool</div>',
                 '</div>'
             ]
         }, {
diff --git a/client/App/resources/css/application.css b/client/App/resources/css/application.css
index adea2d3..75aba01 100644
--- a/client/App/resources/css/application.css
+++ b/client/App/resources/css/application.css
@@ -13,18 +13,18 @@
 .logo-right-container {
     float: right;
     margin: 0px 20px 10px 0px;
-    width: 200px;
+    width: 400px;
     height: 60px;
 }
 .logo-right-top {
-    width: 200px;
+    width: 400px;
     height: 30px;
     float: left;
 }
 .app-title {
     font-size: 1.2em;
     color: white;
-    width: 200px;
+    width: 400px;
     height: 30px;
     text-align: right;
 }
diff --git a/client/App/resources/images/icons/arrow_divide.png b/client/App/resources/images/icons/arrow_divide.png
new file mode 100644
index 0000000..61a7b1d
Binary files /dev/null and b/client/App/resources/images/icons/arrow_divide.png differ
diff --git a/client/App/util/Container.js b/client/App/util/Container.js
new file mode 100644
index 0000000..427e6e7
--- /dev/null
+++ b/client/App/util/Container.js
@@ -0,0 +1,42 @@
+/**
+ * Utility functions for Ext containers.
+ */
+Ext.define('App.util.Container', {
+    singleton: true,
+    /**
+     * Return the first field of a form panel that is editable
+     * (and also enabled and not a mere display field).
+     * This is usually the field you initially want to
+     * move the focus to.
+     */
+    getFirstEditableField: function(formPanel) {
+        return formPanel.getForm().getFields().findBy(function(field) {
+            var isEditable = field.editable === undefined || field.editable === true;
+            var isDisabled = field.isDisabled();
+            var isDisplayfield = Ext.getClass(field) === Ext.form.field.Display;
+            return isEditable && !isDisabled && !isDisplayfield;
+        });
+    },
+    /**
+     * Focus the first field of a form panel that is editable.
+     * See getFirstEditableField.
+     */
+    focusFirstEditableField: function(formPanel) {
+        this.getFirstEditableField(formPanel).focus();
+    },
+    /**
+     * Apply the mode to all components of a container,
+     * using the following custom properties:
+     *
+     * - disabledInModes: ['mode1', 'mode2']
+     * - hiddenInModes:  ['mode3', 'mode4', 'mode5']
+     */
+    applyMode: function(container, mode) {
+        container.query('[disabledInModes]').forEach(function(component) {
+            component.setDisabled(Ext.Array.contains(component.disabledInModes, mode));
+        });
+        container.query('[hiddenInModes]').forEach(function(component) {
+            component.setVisible(!Ext.Array.contains(component.hiddenInModes, mode));
+        });
+    }
+});
diff --git a/client/App/util/GeometryParser.js b/client/App/util/GeometryParser.js
new file mode 100644
index 0000000..85c3d2a
--- /dev/null
+++ b/client/App/util/GeometryParser.js
@@ -0,0 +1,187 @@
+/**
+ * Parse various geometry formats, such as WKT, GeoJSON, and OVL.
+ */
+Ext.define('App.util.GeometryParser', {
+    singleton: true,
+    /**
+     * Parse any geometry.
+     *
+     * Return a GeoJSON object structure on success.
+     * Return null on error.
+     */
+    parse: function(s) {
+        var formats = [
+            'GeoJSON',
+            'WKT',
+            'OVL',
+            'AnyText'
+        ];
+        for (var i = 0, len = formats.length; i < len; i++) {
+            var geom = this['parse' + formats[i]](s);
+            if (geom !== null) {
+                return geom;
+            }
+        }
+        return null;
+    },
+    /**
+     * Parse any unformatted text.
+     *
+     * This allows for copy&paste from Spreadsheet documents or Wikipedia.
+     */
+    parseAnyText: function(s) {
+        var letters = {
+            N: {type: 'lat', sign: +1},
+            S: {type: 'lat', sign: -1},
+            E: {type: 'lon', sign: +1},
+            O: {type: 'lon', sign: +1},
+            W: {type: 'lon', sign: -1}
+        };
+        var coordRegex = /(\d+)°(\d+)'(\d+)''([NSEOW])/g;
+        var unorderedCoordinates = [];
+        var match;
+        while ((match = coordRegex.exec(s)) !== null) {
+            var deg = parseFloat(match[1]);
+            var min = parseFloat(match[2]);
+            var sec = parseFloat(match[3]);
+            var letterInfo = letters[match[4]];
+            unorderedCoordinates.push({
+                value: ((((sec / 60) + min) / 60) + deg) * letterInfo.sign,
+                type: letterInfo.type
+            });
+        }
+        if (unorderedCoordinates.length === 0) {
+            return null;
+        }
+        if (unorderedCoordinates.length % 2 !== 0) {
+            return null;
+        }
+        var coordinates = [];
+        for (var i = 0; 2*i < unorderedCoordinates.length; i++) {
+            var a = unorderedCoordinates[2*i];
+            var b = unorderedCoordinates[2*i + 1];
+            if (a.type === 'lon' && b.type === 'lat') {
+                coordinates.push([a.value, b.value]);
+            } else if (a.type === 'lat' && b.type === 'lon') {
+                coordinates.push([b.value, a.value]);
+            } else {
+                return null;
+            }
+        }
+        if (coordinates.length === 1) {
+            return {type: 'Point', coordinates: coordinates[0]};
+        } else {
+            var first = coordinates[0];
+            var last = coordinates[coordinates.length - 1];
+            if (first[0] !== last[0] || first[1] !== last[1]) {
+                // Close polygon
+                coordinates.push(first);
+            }
+            // Simple polygon with just one outer ring and no inner rings (i.e. no holes)
+            return {type: 'Polygon', coordinates: [coordinates]};
+        }
+    },
+    /**
+     * Parse GeoJSON geometry.
+     *
+     * Return a GeoJSON object structure on success.
+     * Return null on error.
+     */
+    parseGeoJSON: function(s) {
+        var geom;
+        try {
+            geom = JSON.parse(s);
+        } catch (e) {
+            return null;
+        }
+        if (new OpenLayers.Format.GeoJSON().read(geom) === null) {
+            return null;
+        }
+        return geom;
+    },
+    /**
+     * Parse OVL geometry.
+     *
+     * Return a GeoJSON object structure on success.
+     * Return null on error.
+     */
+    parseOVL: function(s) {
+        if (!/^\[[^\[\]]+\]\r?\n/.test(s)) {
+            return null;
+        }
+        var lines = s.split(/\r?\n/);
+        var sections = [];
+        var values = {};
+        lines.forEach(function(line) {
+            var match = line.match(/^\[(.*)\]$/);
+            if (match !== null) {
+                values = {};
+                sections.push({section: match[1], values: values});
+                return;
+            }
+            var match = line.match(/^([^=]+)=(.*)$/);
+            if (match !== null) {
+                var key = match[1].trim();
+                if (key !== '') {
+                    values[key] = match[2].trim();
+                }
+                return;
+            }
+        });
+        var linestrings = [];
+        var polygons = [];
+        sections.forEach(function(section) {
+            if (/^Symbol \d+$/.test(section.section)) {
+                var values = section.values;
+                var coordinates = [];
+                for (var i = 0; true; i++) {
+                    var x = parseFloat(values['XKoord' + i]);
+                    var y = parseFloat(values['YKoord' + i]);
+                    if (isNaN(x) || isNaN(y)) {
+                        break;
+                    }
+                    coordinates.push([x, y]);
+                }
+                if (coordinates.length !== 0) {
+                    if (values['Typ'] === '3') {
+                        // Simple linestring
+                        linestrings.push(coordinates);
+                    } else if (values['Typ'] === '4') {
+                        // Simple polygon with just one outer ring and no inner rings (i.e. no holes)
+                        polygons.push([coordinates]);
+                    }
+                }
+            }
+        });
+        if (linestrings.length !== 0) {
+            // Ignore polygons if linestrings are present,
+            // because OpenLayer is currently unable to display both in a single geometry
+            return {type: 'MultiLineString', coordinates: linestrings};
+        } else if (polygons.length !== 0) {
+            return {type: 'MultiPolygon', coordinates: polygons};
+        } else {
+            return null;
+        }
+    },
+    /**
+     * Parse WKT geometry.
+     *
+     * Return a GeoJSON object structure on success.
+     * Return null on error.
+     */
+    parseWKT: function(s) {
+        var feature = new OpenLayers.Format.WKT().read(s);
+        if (feature === undefined) {
+            return null;
+        } else if (Ext.isArray(feature)) {
+            // Convert list of features to geometry collection
+            return JSON.parse(new OpenLayers.Format.GeoJSON().write(
+                new OpenLayers.Geometry.Collection(
+                    feature.map(function(f) { return f.geometry; })
+                )
+            ));
+        } else {
+            return JSON.parse(new OpenLayers.Format.GeoJSON().write(feature.geometry));
+        }
+    }
+});
diff --git a/client/App/widget/DateTimeFieldBnl.js b/client/App/widget/DateTimeFieldBnl.js
new file mode 100644
index 0000000..0cb5f34
--- /dev/null
+++ b/client/App/widget/DateTimeFieldBnl.js
@@ -0,0 +1,109 @@
+/**
+ * App.widget.DateTimeFieldBnl
+ */
+Ext.define('App.widget.DateTimeFieldBnl', {
+    extend: 'Ext.form.FieldContainer',
+    alias: 'widget.DateTimeFieldBnl',
+    requires: [
+    ],
+    mixins: {
+        field: 'Ext.form.field.Field'
+    },
+    config: {
+        /**
+         * Valid values are:
+         * 'begin' (default, convert 24:00 to 00:00 of next day)
+         * 'end' (convert 00:00 to 24:00 of previous day)
+         */
+        rangeType: 'begin'
+    },
+    constructor: function(config) {
+        Ext.apply(config, {
+            layout: 'hbox',
+            items: [{
+                xtype: 'datefield',
+                itemId: 'dateField',
+                width: 90,
+                isFormField: false
+            }, {
+                xtype: 'textfield',
+                itemId: 'timeField',
+                width: 40,
+                allowBlank: true,
+                regex: /^(([01]?[0-9]|2[0-3])(:?[0-5][0-9])?|24(:?00)?)$/,
+                maxLength: 5,
+                enforceMaxLength: true,
+                isFormField: false
+            }]
+        });
+        this.callParent([config]);
+        this.getDateField().on({
+            scope: this,
+            change: this.onChange
+        });
+        this.getTimeField().on({
+            scope: this,
+            change: this.onChange
+        });
+        this.initField();
+    },
+    onChange: function() {
+        this.markInvalid([]);
+        return this.mixins.field.onChange.call(this);
+    },
+    getValue: function() {
+        var dateValue = this.getDateField().getValue();
+        var timeValue = this.getTimeField().getValue();
+        if (this.isValid() && dateValue !== null) {
+            // Handle empty time as '00:00'
+            timeValue = timeValue.replace(/^$/, '00:00');
+            // Add missing colon ('234' to '2:34')
+            timeValue = timeValue.replace(/^(.*\d)(\d\d)$/, '$1:$2');
+            // Add missing minutes ('2' to '2:00')
+            timeValue = timeValue.replace(/^(\d?\d)$/, '$1:00');
+            // Add missing leading zero ('2:00' to '02:00')
+            timeValue = timeValue.replace(/^(\d:.*)$/, '0$1');
+            // Convert '24:00' to '00:00' of next day
+            if (timeValue === '24:00') {
+                timeValue = '00:00';
+                dateValue = Ext.Date.add(dateValue, Ext.Date.DAY, +1);
+            }
+            this.value = Ext.Date.parse(Ext.Date.format(dateValue, 'Y-m-d ') + timeValue, 'Y-m-d H:i', true);
+        } else {
+            this.value = null;
+        }
+        return this.mixins.field.getValue.call(this);
+    },
+    setValue: function(value) {
+        if (Ext.isDate(value)) {
+            var dateValue = value;
+            var timeValue = Ext.Date.format(value, 'H:i');
+            // Convert '00:00' to '24:00' of previous day if the rangeType requires that
+            if (this.getRangeType() === 'end' && timeValue === '00:00') {
+                dateValue = Ext.Date.add(dateValue, Ext.Date.DAY, -1);
+                timeValue = '24:00';
+            }
+            this.getDateField().setValue(dateValue);
+            this.getTimeField().setValue(timeValue);
+        } else {
+            this.getDateField().setValue(null);
+            this.getTimeField().setValue('');
+        }
+        return this.mixins.field.setValue.call(this, value);
+    },
+    getErrors: function(value) {
+        var dateErrors = this.getDateField().getErrors(value);
+        var timeErrors = this.getTimeField().getErrors(value);
+        return dateErrors.concat(timeErrors);
+    },
+    markInvalid: function(errors) {
+        this.getDateField().markInvalid(errors);
+        this.getTimeField().markInvalid(errors);
+    },
+    getDateField: function() {
+        return this.getComponent('dateField');
+    },
+    getTimeField: function() {
+        return this.getComponent('timeField');
+    }
+});
diff --git a/client/App/widget/GeometryField.js b/client/App/widget/GeometryField.js
new file mode 100644
index 0000000..69da93e
--- /dev/null
+++ b/client/App/widget/GeometryField.js
@@ -0,0 +1,30 @@
+/**
+ * Form field for entering geometries.
+ */
+Ext.define('App.widget.GeometryField', {
+    extend: 'Ext.form.field.TextArea',
+    alias: 'widget.GeometryField',
+    requires: [
+        'App.util.GeometryParser'
+    ],
+    height: 80,
+    validator: function(value) {
+        if (value === '') {
+            return true;
+        }
+        var geom = App.util.GeometryParser.parse(this.getValue());
+        return geom === null ? 'Invalid geometry' : true;
+    },
+    valueToRaw: function(value) {
+        return '' + Ext.value(value, '');
+    },
+    rawToValue: function(raw) {
+        // @todo: return App.util.GeometryParser.parse(raw);
+        var geom = App.util.GeometryParser.parse(raw);
+        if (geom === null) {
+            return '';
+        } else {
+            return new OpenLayers.Format.WKT().write(new OpenLayers.Format.GeoJSON().read(geom)[0]);
+        }
+    }
+});
diff --git a/client/build/Ext_Loader_history.txt b/client/build/Ext_Loader_history.txt
index b39b4a8..16e62a3 100644
--- a/client/build/Ext_Loader_history.txt
+++ b/client/build/Ext_Loader_history.txt
@@ -396,6 +396,13 @@ App.widget.map.store.Mission
 App.widget.map.MapPanel
 App.module.booking.view.BookingPanel
 App.module.basicdata.view.BasicData
+App.util.GeometryParser
+App.widget.DateTimeFieldBnl
+App.widget.GeometryField
+App.module.bnl.view.BnlGrid
+App.module.bnl.view.BnlForm
+App.module.bnl.view.BnlContextMenu
+App.module.bnl.view.Bnl
 App.module.main.view.Menu
 App.module.main.view.Main
 App.module.main.view.Viewport
@@ -607,3 +614,15 @@ App.module.common.model.Airport
 App.module.common.store.Airport
 App.module.common.model.AircraftType
 App.module.common.store.AircraftType
+App.util.Container
+App.module.bnl.model.Bnl
+App.module.bnl.model.Bnlcenter
+App.module.bnl.model.Bnltype
+App.module.bnl.model.UomHorizontal
+App.module.bnl.model.UomVertical
+App.module.bnl.store.Bnl
+App.module.bnl.store.Bnlcenter
+App.module.bnl.store.Bnltype
+App.module.bnl.store.UomHorizontal
+App.module.bnl.store.UomVertical
+App.module.bnl.controller.Bnl
diff --git a/server/app/Controller/BnlController.php b/server/app/Controller/BnlController.php
new file mode 100644
index 0000000..40c73ed
--- /dev/null
+++ b/server/app/Controller/BnlController.php
@@ -0,0 +1,117 @@
+<?php
+
+class BnlController extends Zend_Controller_Action
+{
+    private $def = array(
+        'schema' => 'acos',
+        'tables' => array(
+            'bnl' => array(
+                'bnl_id' => array(
+                    'createSql' => 'default',
+                    'createParams' => array(),
+                ),
+                'bnlnumber' => array(
+                    'createSql' => '(select coalesce(max(bnlnumber) + 1, 1) from bnl where year = ?)',
+                    'createParams' => array('year'),
+                ),
+                'geom' => array(
+                    // @todo: Do this automatically for columns of type GEOMETRY
+                    // @todo: Use ST_AsGeoJSON(geom)
+                    'readSql' => 'ST_AsText(geom)',
+                ),
+            ),
+            'bnlcenter' => array(),
+            'bnltype' => array(),
+            'uom_horizontal' => array(),
+            'uom_vertical' => array(),
+        ),
+    );
+
+    public function init()
+    {
+        $this->getInvokeArg('bootstrap')->acl->check('bnl');
+        $this->db = $this->getInvokeArg('bootstrap')->db;
+        require_once 'Model/Crud.php';
+        $this->crud = new \Model\Crud($this->db, $this->def);
+        require_once 'Clickenv/Xmpp.php';
+        $this->xmpp = new \Clickenv\Xmpp;
+    }
+
+    public function interpolatecircleAction()
+    {
+        // @todo: Take center as GeoJSON in the future
+        // $query = 'select ST_AsGeoJSON(interpolate_circle(ST_GeomFromGeoJSON(?), ?))';
+        $query = 'select ST_AsGeoJSON(interpolate_circle(ST_GeomFromText(?), ?))';
+        $params = array(
+            $this->getRequest()->getParam('center'),
+            $this->getRequest()->getParam('radius'),
+        );
+        $resultJson = $this->db->fetchOne($query, $params);
+        $result = json_decode($resultJson);
+        $this->_helper->json($result);
+    }
+
+    public function createAction()
+    {
+        $table = $this->getRequest()->getParam('table');
+        $rows = $this->getRows();
+        $this->db->beginTransaction();
+        $resultRows = $this->crud->create($table, $rows);
+        $this->db->commit();
+        $result = array(
+            $table => $resultRows,
+        );
+        $this->xmpp->send(array('bnlReload' => true));
+        $this->_helper->json($result);
+    }
+
+    public function readAction()
+    {
+        $table = $this->getRequest()->getParam('table');
+        $this->db->beginTransaction();
+        $resultRows = $this->crud->read($table);
+        $this->db->commit();
+        $result = array(
+            $table => $resultRows,
+        );
+        $this->_helper->json($result);
+    }
+
+    public function updateAction()
+    {
+        $table = $this->getRequest()->getParam('table');
+        $rows = $this->getRows();
+        $this->db->beginTransaction();
+        $this->crud->update($table, $rows);
+        $this->db->commit();
+        $result = array(
+            'success' => true,
+        );
+        $this->xmpp->send(array('bnlReload' => true));
+        $this->_helper->json($result);
+    }
+
+    public function deleteAction()
+    {
+        $table = $this->getRequest()->getParam('table');
+        $rows = $this->getRows();
+        $this->db->beginTransaction();
+        $this->crud->delete($table, $rows);
+        $this->db->commit();
+        $result = array(
+            'success' => true,
+        );
+        $this->xmpp->send(array('bnlReload' => true));
+        $this->_helper->json($result);
+    }
+
+    private function getRows()
+    {
+        $data = json_decode($this->getRequest()->getRawBody());
+        if (is_array($data)) {
+            return $data;
+        } else {
+            return array($data);
+        }
+    }
+}
diff --git a/server/app/Model/Crud.php b/server/app/Model/Crud.php
new file mode 100644
index 0000000..b00df1d
--- /dev/null
+++ b/server/app/Model/Crud.php
@@ -0,0 +1,277 @@
+<?php
+
+namespace Model;
+
+class Crud
+{
+    private $db;
+    private $def;
+    private $spec;
+
+    public function __construct($db, $def)
+    {
+        $this->db = $db;
+        $this->def = $def;
+        $this->spec = null;
+    }
+
+    /**
+     * Create (insert) one or more rows into a table.
+     */
+    public function create($table, $rows)
+    {
+        $tableSpec = $this->getTableSpec($table);
+        $returnColumns = array();
+        $valuesSql = array();
+        $paramFields = array();
+        foreach ($tableSpec->columnDefs as $column => $columnSpec) {
+            $valuesSql[] = $columnSpec->createSql;
+            foreach ($columnSpec->createParams as $paramColumn) {
+                $paramFields[] = $paramColumn;
+            }
+            if ($columnSpec->createSql !== '?') {
+                $returnColumns[] = $column;
+            }
+        }
+        $queryParts = array(
+            'insert into ',
+            $this->getSchema(),
+            '.',
+            $table,
+            ' (',
+            implode(', ', $tableSpec->columns),
+            ') values (',
+            implode(', ', $valuesSql),
+            ') returning ',
+            implode(', ', $returnColumns),
+        );
+        $query = implode('', $queryParts);
+        $resultRows = array();
+        foreach ($rows as $row) {
+            $params = array();
+            foreach ($paramFields as $paramField) {
+                $params[] = $row->{$paramField};
+            }
+            $resultRows[] = $this->db->fetchRow($query, $params, \Zend_Db::FETCH_OBJ);
+        }
+        return $resultRows;
+    }
+
+    /**
+     * Read (select) some rows from a table.
+     */
+    public function read($table)
+    {
+        $tableSpec = $this->getTableSpec($table);
+        $selectColumns = array();
+        foreach ($tableSpec->columnDefs as $column => $columnSpec) {
+            $selectColumns[] = $columnSpec->readSql.' as '.$column;
+        }
+        $queryParts = array(
+            'select ',
+            implode(', ', $selectColumns),
+            ' from ',
+            $this->getSchema(),
+            '.',
+            $table,
+            ' order by ',
+            implode(', ', $tableSpec->columns),
+        );
+        $query = implode('', $queryParts);
+        $params = array();
+        $resultRows = $this->db->fetchAll($query, $params, \Zend_Db::FETCH_OBJ);
+        return $resultRows;
+    }
+
+    /**
+     * Update one or more rows in a table.
+     */
+    public function update($table, $rows)
+    {
+        $tableSpec = $this->getTableSpec($table);
+        $queryParts = array(
+            'update ',
+            $this->getSchema(),
+            '.',
+            $table,
+            ' set (',
+            implode(', ', $tableSpec->columns),
+            ') = (',
+            $this->questionMarks($tableSpec->columns),
+            ') where (',
+            implode(', ', $tableSpec->pkColumns),
+            ') = (',
+            $this->questionMarks($tableSpec->pkColumns),
+            ')',
+        );
+        $query = implode('', $queryParts);
+        foreach ($rows as $row) {
+            $params = array();
+            foreach ($tableSpec->columns as $column) {
+                $params[] = $row->{$column};
+            }
+            foreach ($tableSpec->pkColumns as $pkColumn) {
+                $params[] = $row->{$pkColumn};
+            }
+            $this->db->query($query, $params);
+        }
+    }
+
+    /**
+     * Delete one or more rows from a table.
+     */
+    public function delete($table, $rows)
+    {
+        $tableSpec = $this->getTableSpec($table);
+        $queryParts = array(
+            'delete from ',
+            $this->getSchema(),
+            '.',
+            $table,
+            ' where (',
+            implode(', ', $tableSpec->pkColumns),
+            ') = (',
+            $this->questionMarks($tableSpec->pkColumns),
+            ')',
+        );
+        $query = implode('', $queryParts);
+        foreach ($rows as $row) {
+            $params = array();
+            foreach ($tableSpec->pkColumns as $pkColumn) {
+                $params[] = $row->{$pkColumn};
+            }
+            $this->db->query($query, $params);
+        }
+    }
+
+    /**
+     * Return the schema name, loading the spec if not already loaded.
+     */
+    private function getSchema()
+    {
+        return $this->getSpec()->schema;
+    }
+
+    /**
+     * Return the spec of a table, loading it if not already loaded.
+     *
+     * See loadSpec() for a description of the spec structure.
+     */
+    private function getTableSpec($table)
+    {
+        return $this->getSpec()->tables[$table];
+    }
+
+    /**
+     * Return the spec, loading it if not already loaded.
+     *
+     * See loadSpec() for a description of the spec structure.
+     */
+    private function getSpec()
+    {
+        if ($this->spec === null) {
+            $this->spec = $this->loadSpec();
+        }
+        return $this->spec;
+    }
+
+    /**
+     * Load table spec by merging the configuration with the
+     * information schema of the database.
+     *
+     * Result structure of the spec:
+     *
+     *      object(
+     *          schema => 'schema1'
+     *          tables => array(
+     *              'table1' => object(
+     *                  columns => array('pkcol1', ..., 'col1', ...)
+     *                  pkColumns => array('pkcol1', ...)
+     *                  columnDefs => array(
+     *                      'col1' => object(
+     *                          create => 'query1'
+     *                          createParams => array('param1', ...)
+     *                      )
+     *                      ...
+     *                  )
+     *              )
+     *              ...
+     *          )
+     *      )
+     */
+    private function loadSpec()
+    {
+        $tables = array_keys($this->def['tables']);
+        $query = '
+            select
+                table_name,
+                column_name,
+                constraint_type is not null primary_key
+            from
+                information_schema.columns
+            natural left join
+                (
+                    select
+                        *
+                    from
+                        information_schema.table_constraints
+                    natural join
+                        information_schema.constraint_column_usage
+                    where
+                        constraint_type = \'PRIMARY KEY\'
+                ) primary_key
+            where
+                table_schema = ?
+            and
+                table_name in ('.$this->questionMarks($tables).')
+            order by
+                table_name,
+                ordinal_position
+        ';
+        $params = array_merge(array($this->def['schema']), $tables);
+        $spec = (object)array(
+            'schema' => $this->def['schema'],
+            'tables' => array(),
+        );
+        foreach ($this->def['tables'] as $table => $tableDef) {
+            $spec->tables[$table] = (object)array(
+                'columns' => array(),
+                'pkColumns' => array(),
+                'columnDefs' => array(),
+            );
+        }
+        foreach ($this->db->fetchAll($query, $params, \Zend_Db::FETCH_OBJ) as $row) {
+            $spec->tables[$row->table_name]->columns[] = $row->column_name;
+            if ($row->primary_key) {
+                $spec->tables[$row->table_name]->pkColumns[] = $row->column_name;
+            }
+            $spec->tables[$row->table_name]->columnDefs[$row->column_name] = (object)array(
+                'createSql' => '?',
+                'createParams' => array($row->column_name),
+                'readSql' => $row->column_name,
+            );
+        }
+        foreach ($spec->tables as $table => &$tableSpec) {
+            foreach ($tableSpec->columnDefs as $column => &$columnSpec) {
+                if (isset($this->def['tables'][$table][$column])) {
+                    $customColumnSpec = $this->def['tables'][$table][$column];
+                    foreach ($columnSpec as $columnSpecField => &$columnSpecValue) {
+                        if (isset($customColumnSpec[$columnSpecField])) {
+                            $columnSpecValue = $customColumnSpec[$columnSpecField];
+                        }
+                    }
+                }
+            }
+        }
+        return $spec;
+    }
+
+    /**
+     * Return comma separated list of question marks with
+     * one question mark for each element in $list.
+     */
+    private function questionMarks($list)
+    {
+        return '?'.str_repeat(', ?', count($list) - 1);
+    }
+}
diff --git a/server/db/auth/table_fix/permission.sql b/server/db/auth/table_fix/permission.sql
index 910fd81..1df9765 100644
--- a/server/db/auth/table_fix/permission.sql
+++ b/server/db/auth/table_fix/permission.sql
@@ -20,6 +20,7 @@ insert into permission (permission, permission_name, description) values
 ('sysadmin',   'System Administrator', 'System Administrator'),
 ('admin',      'Administrator',        'Administrator'),
 ('postedit',   'Post Ops Editor',      'Post Ops Editor'),
+('bnl',        'BNL',                  'BNL'),
 ('operator',   'Operator',             'Operator'),
 ('requester',  'Requester',            'Requester'),
 ('monitor',    'Monitor',              'Monitor'),
diff --git a/server/db/auth/table_fix/role.sql b/server/db/auth/table_fix/role.sql
index 8ff35c6..b5ac979 100644
--- a/server/db/auth/table_fix/role.sql
+++ b/server/db/auth/table_fix/role.sql
@@ -15,6 +15,7 @@ insert into role (role, active_role, description) values
 ('System Administrator', true,  'System Administrator'),
 ('Administrator',        true,  'Administrator'),
 ('Post Ops Editor',      true,  'ASM Post Ops Editor'),
+('BNL',                  true,  'BNL'),
 ('Operator',             true,  'ASM Operator'),
 ('Requester',            true,  'ASM Requester'),
 ('Monitor',              true,  'ASM Monitor'),
diff --git a/server/db/auth/table_fix/role_permission.sql b/server/db/auth/table_fix/role_permission.sql
index 65976a8..20bd975 100644
--- a/server/db/auth/table_fix/role_permission.sql
+++ b/server/db/auth/table_fix/role_permission.sql
@@ -20,12 +20,14 @@ insert into role_permission (role, permission) values
 ('System Administrator', 'sysadmin'),
 ('System Administrator', 'admin'),
 ('System Administrator', 'postedit'),
+('System Administrator', 'bnl'),
 ('System Administrator', 'operator'),
 ('System Administrator', 'requester'),
 ('System Administrator', 'monitor'),
 ('System Administrator', 'singleuser'),
 ('Administrator', 'admin'),
 ('Administrator', 'postedit'),
+('Administrator', 'bnl'),
 ('Administrator', 'operator'),
 ('Administrator', 'requester'),
 ('Administrator', 'monitor'),
@@ -34,6 +36,8 @@ insert into role_permission (role, permission) values
 ('Post Ops Editor', 'operator'),
 ('Post Ops Editor', 'requester'),
 ('Post Ops Editor', 'monitor'),
+('BNL', 'bnl'),
+('BNL', 'monitor'),
 ('Operator', 'operator'),
 ('Operator', 'requester'),
 ('Operator', 'monitor'),
diff --git a/server/db/bnl/func/interpolate_circle.sql b/server/db/bnl/func/interpolate_circle.sql
new file mode 100644
index 0000000..c657f80
--- /dev/null
+++ b/server/db/bnl/func/interpolate_circle.sql
@@ -0,0 +1,25 @@
+drop function if exists interpolate_circle(geometry, numeric) cascade;
+
+create function interpolate_circle
+    (
+        center geometry, -- $1
+        radius numeric -- $2
+    )
+    returns geometry
+    stable
+    returns null on null input
+    language sql
+as $$
+    select
+        ST_Transform(
+            ST_Buffer(
+                ST_Transform(
+                    ST_SetSRID($1, 4326),
+                    25832
+                ),
+                $2,
+                64
+            ),
+            4326
+        )
+$$;
diff --git a/server/db/bnl/table_fix/bnlcenter.sql b/server/db/bnl/table_fix/bnlcenter.sql
new file mode 100644
index 0000000..e95dc74
--- /dev/null
+++ b/server/db/bnl/table_fix/bnlcenter.sql
@@ -0,0 +1,19 @@
+create table if not exists bnlcenter (
+    center text not null,
+    center_label text not null,
+    primary key
+        (center),
+    unique
+        (center_label),
+    foreign key
+        (center)
+        references center
+        (center)
+        on delete no action on update cascade deferrable
+);
+
+delete from bnlcenter;
+insert into bnlcenter (center, center_label) values
+('EDGG', 'GG'),
+('EDMM', 'MM'),
+('EDWW', 'WW');
diff --git a/server/db/bnl/table_fix/bnltype.sql b/server/db/bnl/table_fix/bnltype.sql
new file mode 100644
index 0000000..31c43c7
--- /dev/null
+++ b/server/db/bnl/table_fix/bnltype.sql
@@ -0,0 +1,21 @@
+create table if not exists bnltype (
+    bnltype text not null,
+    description text not null,
+    primary key
+        (bnltype),
+    unique
+        (description)
+);
+
+delete from bnltype;
+insert into bnltype (bnltype, description) values
+('Acro',      'Aerobatic'),
+('PJE-MIL',   'Parachute Jumping Exercise MIL'),
+('PJE-NOTAM', 'Parachute Jumping Exercise NOTAM'),
+('PJE-SPZ',   'Parachute Jumping Exercise SPZ'),
+('Gas',       'Gas Blowout'),
+('Bomb',      'Bomb Disposal'),
+('Airshow',   'Airshow'),
+('Gli',       'Gliding'),
+('Scan',      'Scanning Flights'),
+('Others',    'Others');
diff --git a/server/db/bnl/table_fix/uom_horizontal.sql b/server/db/bnl/table_fix/uom_horizontal.sql
new file mode 100644
index 0000000..0509775
--- /dev/null
+++ b/server/db/bnl/table_fix/uom_horizontal.sql
@@ -0,0 +1,10 @@
+create table if not exists uom_horizontal (
+    uom_horizontal text not null,
+    primary key
+        (uom_horizontal)
+);
+
+delete from uom_horizontal;
+insert into uom_horizontal (uom_horizontal) values
+('NM'),
+('m');
diff --git a/server/db/bnl/table_fix/uom_vertical.sql b/server/db/bnl/table_fix/uom_vertical.sql
new file mode 100644
index 0000000..d7af01a
--- /dev/null
+++ b/server/db/bnl/table_fix/uom_vertical.sql
@@ -0,0 +1,11 @@
+create table if not exists uom_vertical (
+    uom_vertical text not null,
+    primary key
+        (uom_vertical)
+);
+
+delete from uom_vertical;
+insert into uom_vertical (uom_vertical) values
+('m'),
+('ft'),
+('FL');
diff --git a/server/db/bnl/table_live/bnl.sql b/server/db/bnl/table_live/bnl.sql
new file mode 100644
index 0000000..0c27300
--- /dev/null
+++ b/server/db/bnl/table_live/bnl.sql
@@ -0,0 +1,83 @@
+create table if not exists bnl (
+    bnl_id uuid not null default uuid_generate_v4(),
+    year integer not null,
+    bnlnumber integer not null,
+    center text not null,
+    bnltype text not null,
+    valid_begin timestamp not null,
+    valid_end timestamp not null,
+    mapname text not null,
+    geom geometry null,
+    lower_value decimal null,
+    lower_uom text null,
+    upper_value decimal null,
+    upper_uom text null,
+    sep_value decimal null,
+    sep_uom text null,
+    contact text not null,
+    company text not null,
+    address text not null,
+    fax text not null,
+    email text not null,
+    phone text not null,
+    phone_avail text not null,
+    departure text not null,
+    destination text not null,
+    aircraft text not null,
+    pjetype text not null,
+    dropoff integer null,
+    parachute integer null,
+    reference text not null,
+    sector text not null,
+    reported_fis boolean not null,
+    reported_stca boolean not null,
+    reported_assistant boolean not null,
+    reported_twr boolean not null,
+    reported_sectors boolean not null,
+    comment text not null,
+    constraint year check
+        (2000 <= year and year <= 2999),
+    constraint bnlnumber check
+        (bnlnumber >= 1),
+    constraint valid_begin_end check
+        (valid_begin < valid_end),
+    constraint lower_value check
+        (lower_value >= 0),
+    constraint upper_value check
+        (upper_value >= 0),
+    constraint sep_value check
+        (sep_value >= 0),
+    constraint dropoff check
+        (dropoff >= 0),
+    constraint parachute check
+        (parachute >= 0),
+    primary key
+        (bnl_id),
+    unique
+        (year, bnlnumber),
+    foreign key
+        (center)
+        references bnlcenter
+        (center)
+        on delete no action on update cascade deferrable,
+    foreign key
+        (bnltype)
+        references bnltype
+        (bnltype)
+        on delete no action on update cascade deferrable,
+    foreign key
+        (lower_uom)
+        references uom_vertical
+        (uom_vertical)
+        on delete no action on update cascade deferrable,
+    foreign key
+        (upper_uom)
+        references uom_vertical
+        (uom_vertical)
+        on delete no action on update cascade deferrable,
+    foreign key
+        (sep_uom)
+        references uom_horizontal
+        (uom_horizontal)
+        on delete no action on update cascade deferrable
+);
diff --git a/server/db/bnl/upgrade_module.sql b/server/db/bnl/upgrade_module.sql
new file mode 100644
index 0000000..71be6c2
--- /dev/null
+++ b/server/db/bnl/upgrade_module.sql
@@ -0,0 +1,6 @@
+\i func/interpolate_circle.sql
+\i table_fix/bnlcenter.sql
+\i table_fix/bnltype.sql
+\i table_fix/uom_horizontal.sql
+\i table_fix/uom_vertical.sql
+\i table_live/bnl.sql
diff --git a/server/db/init_demo.sql b/server/db/init_demo.sql
index ce9c67d..a11896e 100644
--- a/server/db/init_demo.sql
+++ b/server/db/init_demo.sql
@@ -11,6 +11,7 @@ insert into auth_user (username, user_unit, active_user, password, first_name, l
 ('postedit',  'Default', true, md5('postedit:STANLY_ACOS:test'),   'Post Ops',  'Editor',    'postedit@m-click.de',  '123456789'),
 ('postedits', 'Default', true, md5('postedits:STANLY_ACOS:test'),  'Post Ops',  'S',         'postedits@m-click.de', '123456789'),
 ('milamc',    'Default', true, md5('milamc:STANLY_ACOS:test'),     'Mil',       'AMC',       'milamc@m-click.de',    '123456789'),
+('bnl',       'Default', true, md5('bnl:STANLY_ACOS:test'),        'BNL',       'BNL',       'bnl@example.com',     '123456789'),
 ('op',        'Default', true, md5('op:STANLY_ACOS:test'),         'Op',        'Op',        'op@m-click.de',        '123456789'),
 ('ops',       'Default', true, md5('ops:STANLY_ACOS:test'),        'Op' ,       'S',         'ops@m-click.de',       '123456789'),
 ('req',       'Unit A',  true, md5('req:STANLY_ACOS:test'),        'Req',       'Req',       'req@m-click.de',       '123456789'),
@@ -29,6 +30,8 @@ insert into user_role (username, role) values
 ('postedits', 'Single User'),
 ('milamc',    'Post Ops Editor'),
 ('milamc',    'Single User'),
+('bnl',       'BNL'),
+('bnl',       'Single User'),
 ('op',        'Operator'),
 ('ops',       'Operator'),
 ('ops',       'Single User'),
diff --git a/server/db/migrate_begin.sql b/server/db/migrate_begin.sql
index 962132e..a1d45e7 100644
--- a/server/db/migrate_begin.sql
+++ b/server/db/migrate_begin.sql
@@ -137,3 +137,16 @@ do $$ begin
         update mission_history_entry set reason = 'noshow' where status = 'reported' and reason <> '';
     end if;
 end $$;
+do $$ begin
+    if exists(
+        select * from information_schema.tables
+        where (table_schema, table_name) = ('acos', 'bnlcenter')
+    ) and not exists(
+        select * from information_schema.columns
+        where (table_schema, table_name, column_name) = ('acos', 'bnlcenter', 'center_label')
+    ) then
+        alter table bnl drop constraint bnl_center_fkey;
+        drop table bnlcenter;
+        update bnl set center = 'ED' || center where center in ('GG', 'MM', 'WW');
+    end if;
+end $$;
diff --git a/server/db/migrate_end.sql b/server/db/migrate_end.sql
index b4385d9..64d3cc5 100644
--- a/server/db/migrate_end.sql
+++ b/server/db/migrate_end.sql
@@ -367,3 +367,16 @@ do $$ begin
         drop table ebg;
     end if;
 end $$;
+do $$ begin
+    if not exists(
+        select * from information_schema.table_constraints
+        where (table_schema, table_name, constraint_type, constraint_name) = ('acos', 'bnl', 'FOREIGN KEY', 'bnl_center_fkey')
+    ) then
+        alter table bnl add
+            foreign key
+                (center)
+                references bnlcenter
+                (center)
+                on delete no action on update cascade deferrable;
+    end if;
+end $$;
diff --git a/server/db/upgrade.sql b/server/db/upgrade.sql
index 6717a63..6986946 100644
--- a/server/db/upgrade.sql
+++ b/server/db/upgrade.sql
@@ -32,6 +32,10 @@ set search_path = acos, public;
 \i upgrade_module.sql
 \cd ..
 
+\cd bnl
+\i upgrade_module.sql
+\cd ..
+
 \cd nm
 \i upgrade_module.sql
 \cd ..