Add Cancel and Reset buttons

Fix #554