layout and form fixes