Layout sample and some template modifications