Various changes

Have devised a new favorites UX, and so some of these changes will
likely be removed in up coming commits. Committed for reference. Note:
This commit is not necessarily stable!