Small refactor; Fix a element stacking issue with hidden breadcrumbs/controls