Move layout code to separate template file and remove html tag from index