Changes in gift card sequence and tree view #6382