refactor templates with better inheritance
altered urls to accept punctuation (may alter source data later)