96 - PV - Account page

Copy the changes from feature/account-page branch.