Futher changes to web UI