Merge "New layout and strings for cinematic effect"