Start of integration of new drawer layout standard