Fixed form submit and added analytics