Favorites cleanups

Merged Administrator requested to merge gh-11ed8592/35/unknown/master into master

To make things look nicer on the board.

Merge request reports