Added load more feature - still needs to be polished