Button layout, now have a fix window for every section
Merge branch 'ari_gmail_api'

Conflicts:
	public/js/mvc.js