Separate the category widget from the sub-heading

This simplifies the styling of the sub-heading.

Change-Id: Ic792507aea00c4cdbd512bd7a5ee8d6c2e3bb2b1
Merge "Separate the category widget from the sub-heading"