LRDOCS-529 Addressed Layout Template comments and provided several other...

... small changes

This is ready for trunk. Thanks.