Added Layout and integrate template