Getting ready for Interests

Some UI changes to get ready for filtering by Interests which will be
added in the next few versions.