structural changed to make modifying tab view simpler