Fix styling and js