Add Childbrowser & clean up