Merged (conflicts).
Fixed missing endif
Reworked new template, especially agenda and dashboard.