Form code/style fixes