Adding web ui handling
A little cleanup on webui