Bug Fixes

- Multiple form bugs fixed