Remove dump statement from layout template
Start template cleanup/redesign