MSK-244: Submit button position / clear button fix