Revised code with new design template
New Design