first implementation of new layout