fix issues with CSS and JS