[#926] Layout changed to template file