Fix primary account, redesign page, account identification