Form UI fixes