get rid of default form content (Address...Stop ID)
modularize or-bar