Adding layout dependencies and hierarchy changes