Add ok,apply,cancel buttons
closes #3