+ Improvements to tabs