Add a content_width helper (similar to content_height)
Refactor height/width calculations