Changede javascript filepaths
Implemented markers and removed conflicts
Implemented Markers