Partial 2.1.1 Steps

Changed how optional steps are presented