Small changes
Refactor
js refactor
location-refactor

Conflicts:
	src/assets/js/cuztom.js