Added dates to position, but need to add check if end dates exist. If none exist, 'current' needs to be displayed
Moved templates to external files