Updated form with new prototype mockup