message changes and form layout updates