Settings panel DOM structure fixes