Fixed tabs in some modules