Refactor account & addresses & layout