Fix submit button
Add location option!