Revert "Move Advanced Options"

This reverts commit e9672009d6b20242703197c2ccc020d3cbc1360e.