Moved toggle, fixed js bug