add tabs
fix client part
change style
change script
Merge remote-tracking branch 'origin/master'