Reorganised the tabs