Fix layouts and pics