Updated css files
html and js related updates
Merge branch 'feature/4.4' into develop