Fixed bug in Viewer Toolbar