Major update. Web interface
Merged