synched with master branch ( JS and CSS file)