Updated the template and layout path

* fix #2