Final WebServer tweaks: formatting