[10I] new landing. Fix some bugs in template