Support title / subtitle

Created by: slifty

In the recent changes we removed support for title / subtitle but didn't remove the UX.

We should re-enable support for title / subtitle.