Rework Advanced Options guide for 2.0