revamp webserver

Change-Id: I140bd9ccaf29fe347cba72e737f2a861b054a8d3