Refactored to test changes to client details screen