Fix video and layout