gridplot toolbar fixes

issues: fixes #1461