Various change on repo, includeing children container design