Switched input with label

Conflicts:
	app/public/templates/app.html