Adding in media and layout