Moved js and css to external files
Fixed merge conflict