front page templating
fix merge