Added new layout with header & footer