Back to layout fixing