Interactivity on dashboard
Merge branch 'tabs-2'