Add 'Apply' button, close #13