UI changes to Waivers Creation Form