fix submit button
other fixes