1. Tab Component UI Bug Fixes
2. Code Refractoring