Fix Trim Tag issue

also dynamic the the Title for Tool Tip
Merge branch 'abdullah_4.0' into umair_