Moving analytics to layout