Updated CSS and javascript