Fixed submit button scoping