Unifying structural patterns; simplifying show/hide functionality accordingly