Tabs added and more modules changed