made it look nicer and bugfix
css changes
updated js
Merge branch 'baibing'
Merge branch 'master' into jonathan