Button functionality fixes for toolset