make the new layout work