Added $content_width support