fixed layout and hover

Conflicts:
	index.html