Webapp big refactor

#348
use shorter version (see comment above)