slightly better message layout and help text logic