Merge "Clean up TabWidget"