Add Chili page and refactor some