Refactoring, also made seperate adapter for personalized booklists