Fix collections page
Fix favourites ordering
Clean up. Add more wallpaper controller specs