Making the home screen more responsive + refactoring a little