Updated templates to link page names, refactored and plugged holes