Fixed slim templates
Completed Section 7.2 closes #16