Continued working on the tabs