Incorporated collapsed by default folding and updated schedule