Edited blade templates

Edited blade templates to take advantage of the templating tools