fix (model,visual,theme) Improve Grid model, d&d still fails