finally completely fixed toggle button