Data Entry Form Bug Fixes and validation