Modified templates to use blade