Removed extra actions path
Fixed a few minor bugs in actions file
Renamed a few functions. Unstable
Merged conflicts

Conflicts:
	src/index.html