WP-2947: change class names.
WP-2947: indentation for clearer changes.
WP-2947L add wrapper to fix input and submit alignment.