And make it faster to load!

If these 2 are fixed I’d use it daily