Added disconnect button
Merge branch 'feature/disconect-button' into develop