Address code review comments and fix child preview