Changed dojo_template to use new layout, better and cleaner.