Layout to remain in index.
Fixed adt dependency