Fix form display issues