More visibility for tool mode