Bug fixes with adding deliverables and form submission