Upgrade to tabs to fix tab size issue