Add address to Venue dropdown
Improve Venue selection and refactor