Account dashboard issue #11 and add resort issue #13