redefine routes and fix params
addresses show up on main page after submit
better labels
fixes conflicts