Adding a more flexible tab interface