Show more button now works correctly, UI is not correct, though