added lazy loading and moved js