Getting template modified into the layout
Pulled changes for merging