Break journal templates into smaller bits.
Refactoring for simplification - remove seemingly useless features from "Group by day" output.
Pull navigation into it's own templates