Revert "Revert "diff tpl and page.. am i on a wrong way?""

This reverts commit c0e7d9e6d17076f44acf078ae2749c89a149dfe9.