Updated for split layout/template useage.