Rewrite account listing
Rewrite account listing and fix some bugs