Fix with new layout