added buttons and tracking