Code clean up
fix tab title issue