Added buttons and analytics