Improve tab interface