Add layout template and remove Hiccup