Adding analytics
Fixing some supervisor settings for button