Simplify footer buttons.
Merge branch 'feature/footer' into develop

Conflicts:
	js/popup.js