small cleanup
Add cancel button
fix bug, should validate now