Follow JS file naming convention
Remove diverged/duplicate file
Follow CSS file naming convention
Merge branch 'env-page2' into better-captures

Conflicts:
	sass/styles.scss