Fix some layout glitches if wan is not filled, cd