Added order to the tabs
Removed simple modal