Can handle smaller screens (520px) better now.

Conflicts:
	index.html