made some improvements based on page speed