ticket #5074 - template change; small layout improvements