WebUI Fixes

Some hot fixes...
Fixed in next commit.
@pmzqla Thank you.