- Fixed form handling
- Added save form