-Fall back on Page template / layout if requested file is missing
-Update spacing/indentation