JS cleanup
JS cleanup
submit-button class cleanup