Fixed the renaming so it also will rename favorites. I also made the popup look better.
Merge branch 'develop' into Fixing-renaming