Reloads things when you refresh
I did some things like fixing the stuff
merging conflicted things