Added buttons
added analytics