Revert "Revert "Move Advanced Options""

This reverts commit 770ad8829f2f81f14b800dd907c5ab3608157e90.