Fixed after rebase
More message info from actual data.
Added drag drop manager