Remove switch-margins. Fix advanced layout.