Make top-level layout template configurable
Improve presentation for method names
Fix whitespace