Better support for servers with HTTP-loopback disabled
Further fixes to earlier hotfixes
Misc layout fixes
Fix to crash issue caused by earlier fix