Layout to use JLayoutHelper and application.xml updated