added lazy loading, dom hooks adapted to new selectors