Resources can be favorited - frontend polish needed.
Fix merge issues.