Fixes to tool buttons on tool page