Added a new macros.html that gets imported into the base template