Several updates and design changes

Conflicts:
	index.html