Feature/template change

Ask @markupguy (Ruan) for some real copy and style.