Modified ovc for toolbar grid operation.
Added swap method connected to click signal.