Modify main form and water modeling form

1. add line in main flow chart
2. marge HomeDevelope branch.
3.