Fixing up those tabs