Initial fix for custom title bar simple case