cherry-pick of give mbg's an outline to make them more distinct

Conflicts:
	static/js/client.js