Bug fix CSS & JS