Fix layouts issue