Added toggle controls