Few more tweaks to tabs