Fixed check ladda fler
Refactoring