Minor enhancements, grid columns reorder etc..