form style cleanup
fixing form styles and merging