Added bases of new layout