added analytics and buttons