A lot of improvements

Conflicts:
	index.html