form fixes and alignment