Adding latest code in order to get latest
Adding latest code in order to get latest
Form improvements
Fixed conflicts