Separated message panel from the grid, other minor modificatons
Fixerd merge conflicts