Minor fixes to JS loading

Conflicts:
	public/index.html