Fixing up tabs a little bit