Fix some UI Display's Components, fix some minor bug.
Merge remote-tracking branch 'origin/VinhDepTrai'
Update Some UserControl
Merge remote-tracking branch 'origin/master' into VinhDepTrai