Modified toggle wrapper to be more dynamic