refactor template and landing