Change hover
Fix tile conflict

Conflicts:
	index.html