<Apurva/Priyanka/Riya> Changed some form layout