Fixes to tabs component