Refactoring Twig Code to a Macro

I refactor some code on CraftQuest so it uses a macro in a separate file instead of living in the template.