Minor adjustments
Resolved conflicts

Conflicts:
	src/js/main.js