This is nearly done on the web UI feature branch, so as soon / if that will be merged, this issue will also be mostly resolved.