More adjustments to show/hide logic.