form fixes/style changes