imp changes as needed

1) room for multiple forms
2) code improvements
3) sub message
4) buttons
etc