Improve webrunner design