diff --git a/README.md b/README.md
index 41ba215..76c1608 100644
--- a/README.md
+++ b/README.md
@@ -1,43 +1,39 @@
# VILLASweb
-## Description
-
-This is VILLASweb, the website displaying and processing simulation data in the web browser. The term __frontend__ refers to this project, the actual website.
-
-The frontend connects to __two__ backends: _VILLASweb-backend-go_ and _VILLASnode_.
-
-VILLASnode provides actual simulation data via websockets. VILLASweb-backend-go provides any other data like user accounts, infrastructure components and configurations, dashboards etc.
-
+This is VILLASweb, the website to configure real-time co-simulations and display simulation real-time data in the web browser.
+The term **frontend** refers to this project, the actual website.
+The frontend connects to **two** backends: [VILLASweb-backend-go](https://git.rwth-aachen.de/acs/public/villas/web-backend-go) and [VILLASnode](https://git.rwth-aachen.de/acs/public/villas/node).
+VILLASnode provides actual simulation data via websockets. VILLASweb-backend-go provides any other data such as user accounts, infrastructure components and configurations, dashboards etc.
For more information on the backends see their repositories.
## Frameworks
-
The frontend is build upon [ReactJS](https://facebook.github.io/react/) and [Flux](https://facebook.github.io/flux/).
-
React is responsible for rendering the UI and Flux for handling the data and communication with the backends. For more information also have a look at REACT.md
-
-Additional libraries are used, for a complete list see package.json.
+Additional libraries are used, for a complete list see the file `package.json`.
## Data model
-

## Quick start
-
-We recommend Docker to get started quickly:
-
```bash
-$ git clone --recursive git@git.rwth-aachen.de:VILLASframework/VILLASweb.git
-$ cd VILLASweb
+$ git clone --recursive https://git.rwth-aachen.de/acs/public/villas/web.git
+$ cd web
$ npm install
$ npm start
```
-
We recommend to start the VILLASweb-backend-go before the frontend.
If you want to use test data (including some test users), you can start the backend with the parameter `-mode=test`.
Please check the repository of the VILLASweb-backend-go to find information on the test user login names and passwords.
The testing mode is NOT intended for production deployments.
+## Documentation
+
+More details on the setup and usage of VILLASweb is available here:
+- [Requirements](doc/Requirements.md)
+- [Structure and datamodel](doc/Structure.md)
+- [Development setup](doc/development.md)
+- [Production setup](doc/Production.md)
+
## Copyright
2020, Institute for Automation of Complex Power Systems, EONERC
diff --git a/doc/Production.md b/doc/Production.md
new file mode 100644
index 0000000..e5fd20c
--- /dev/null
+++ b/doc/Production.md
@@ -0,0 +1,82 @@
+# Production Setup {#web-production}
+
+## Setting up VILLASweb for production
+
+For development setup instructions see @ref web-development.
+The production setup is based on docker.
+Clone the [frontend](https://git.rwth-aachen.de/acs/public/villas/web) and [backend](https://git.rwth-aachen.de/acs/public/villas/web-backend-go) repositories on your computer and build the Docker images for both:
+
+### Frontend
+ - `cd VILLASweb`
+ - `docker build -t villasweb-frontend .`
+
+### Backend
+ - `cd ..\VILLASweb-backend-go`
+ - `docker build -t villasweb-backend .`
+
+### WIP Docker compose and/or Kubernetes
+Run the production docker-compose file:
+ - `docker-compose -f docker-compose-production.yml up -d`
+
+
+## Configure VILLASnode to get data into VILLASweb
+
+### Install VILLASnode
+
+See: @ref node-installation
+
+### Create a VILLASnode demo data source
+
+1. Create a new empty configuration file with the following contents and save it as `webdemo.conf`:
+
+> WIP this example configuration requires revision!
+```
+nodes = {
+ sine = {
+ type = "signal"
+
+ signal = "mixed"
+ values = 5
+ rate = 25
+ frequency = 5
+ }
+
+ web = {
+ type = "websocket"
+
+ destinations = [
+ "TODO"
+ ]
+ }
+ }
+
+ paths = (
+ {
+ in = "sine"
+ out = "web"
+ }
+ )
+```
+
+The node `sine` is a software signal generator for 5 signals.
+The node `web` is the websocket interface to stream the data generated by the `sine` node to the browser.
+
+> Note: If you do not want to use your local system as the destination for the websocket node,
+>change the option `destinations` of the `web` node to the destination of your production environment, for example `https://my.production.environment/ws/webdemo`.
+
+### Start the VILLASnode gateway
+
+Run the following command on your system:
+
+```bash
+villas node webdemo.conf
+```
+> Note: Change the path to the configuration file accordingly. The `villas` command will only work if VILLASnode is installed on your system.
+
+### Visualize real-time data in VILLASweb Dashboards
+1. Use the VILLASweb frontend to create a new infrastructure component for the VILLASnode gateway from above (Admin user required).
+2. Set the `host` parameter of the component to the target you used as the `web.destinations` parameter in the configuration from above.
+3. Create a new scenario in VILLASweb and within that scenario create a new component configuration that uses the infrastructure component you created under 2.
+4. WIP: Use the signal auto-configure function to retrieve the signal configuration of the VILLASnode automatically.
+5. Create a new dashboard with widgets of your choice and link these widgets to the signals received from the infrastructure component.
+6. Enjoy what you see.
diff --git a/doc/Requirements.md b/doc/Requirements.md
index c53871b..2ec0efe 100644
--- a/doc/Requirements.md
+++ b/doc/Requirements.md
@@ -1,16 +1,12 @@
# Requirements {#web-requirements}
-## Services
- - NodeJS: Runs VILLASweb frontend
- - Go: Runs VILLASweb backend
- - PostgreSQL database (min version 11): Backend database
+## Services and tools required for development
+ - [NodeJS with npm](https://nodejs.org/en/): Runs VILLASweb frontend
+ - [Go](https://golang.org/): Runs VILLASweb backend
+ - [PostgreSQL database](https://www.postgresql.org/) (min version 11): Backend database
- [swag](https://github.com/swaggo/swag): For automated API documentation creation
- - NGinX: Webserver and reverse proxy for backends (only for production)
- - Docker: Container management system
+ - [Docker](https://www.docker.com/): Container management system
-## Installed on your local computer
- - NodeJS with npm
- - Go (at least version 1.11)
- - [swag](https://github.com/swaggo/swag)
- - Docker
+## Additional requirements for productive use
+ - [NGinX](https://www.nginx.com/): Webserver and reverse proxy for backends
diff --git a/doc/development.md b/doc/development.md
index 259fb19..5b29595 100644
--- a/doc/development.md
+++ b/doc/development.md
@@ -8,11 +8,11 @@ In order to get started with VILLASweb, you might also want to check our our [de
### Description
-The website itself based on the React JavaScript framework.
+The website itself based on the [React JavaScript framework](https://reactjs.org/) and the [Flux library](https://facebook.github.io/flux/).
### Required
- - NodeJS with npm
+ - [NodeJS with npm](https://nodejs.org/en/)
### Setup
@@ -25,18 +25,19 @@ The website itself based on the React JavaScript framework.
- `npm start`
This runs the development server for the website on your local computer at port 3000.
-The backend must be running to make the website work.
+The backend must be running to make the website work.
+Type `http://localhost:3000/` in the address field of your browser to open the website.
## Backend
### Description
-The backend of VILLASweb uses the programming language Go and a PostgreSQL data base.
+The backend of VILLASweb uses the programming language Go and a PostgreSQL database.
### Required
- - Go (min version 1.11)
- - Running PostgreSQL data base (min version 11)
+ - [Go](https://golang.org/) (min version 1.11)
+ - [PostgreSQL database](https://www.postgresql.org/) (min version 11)
- [swag](https://github.com/swaggo/swag)
### Setup and Running
diff --git a/src/common/table-column.js b/src/common/table-column.js
index 748035a..53b99e5 100644
--- a/src/common/table-column.js
+++ b/src/common/table-column.js
@@ -29,6 +29,7 @@ class TableColumn extends Component {
linkKey: '',
dataIndex: false,
inlineEditable: false,
+ inputType: 'text',
clickable: false,
labelKey: null,
checkbox: false,
diff --git a/src/common/table.js b/src/common/table.js
index b4edea3..d68191a 100644
--- a/src/common/table.js
+++ b/src/common/table.js
@@ -205,7 +205,7 @@ class CustomTable extends Component {
return (