Added 'Next' button, consolidated forms on modal so it's just 1 submission