master latest copy and layout changes