Fixed #95 extra fields for Grid client
Merge branch '95_Pane-mode'