Retooled the join page