improving the form
fixed deselection bug