Style Updates & Added lazy loading