small improvement client side
Merge remote-tracking branch 'origin/integrate_bootstrap' into integrate_bootstrap