Fixing templating issue, simplified layout