Clean up template whitespace and some _layouts