some further reordering, adding of new layouts