add message models and adjust form layout