toggle button fixes