updated container block and templates