Module blocklayered update.
cms tpl update.
Small fixes