Fixing up tabs