Integrate new main template