Use correct button css
Adjust label vertical alignment. Use underscore for form partial filename.
More form vertical alignment fixing