Reformulated flow
Added join dialog