updated for analytics and sidebar