Continued work on multiple tab support