Enhance pages with tabs refs  #489
Enhance pages with tabs refs  #489