add back form save handler
fix form saving dialog