Added blocks and proper extensions to our templates