Added a layout and analytics