Updated web server and made run from top level