Improve favorites view, other minor stuff