updated layout, data-sources data and templates
work merged