1. Change templates \n 2. Add flights template page
merge