refactored account section.