Added form page and Map page