Pesky sorting/scrolling bug fixed (half-fixed, still does not rearrange when scrolling)