Made more things point to the AdvancedEditor