Improve desing. Add back buttons for match items templates.