Fixed to css and js bug