Added Buttons and Analytics