Fixing templating issue, simplified layout
Merge pull request #6 from FrankARod/frank

Fixing templating issue, simplified layout