Adding correct show/hide logic