WebUI: Some changes