Favorites can now be reordered
Some more refactoring