Fixing Account Detail completely