fixed toggle issues and profiles issues