edit create message layout and minor text changes
pull for merge