Fixed javascript import problem and imports problems