Slim-ify the .slim templates
Merge pull request #822 from swrobel/slim-cleanup

Slim-ify the .slim templates