updated to use account shortcuts and the accounts router