Updated Form Display Logic