update still tweaking address layout