Redesigned buttons
Merge branch 'jamie' into shannon

Conflicts:
	client/index.html
Final merge with shannon