oa-645 update user messages form layout