Fixes for submit button