Witness Schedule Style Changes

This ticket is to address the witness schedule style changes