Improved tab layout