Insert connect disconnect buttons

Change-Id: Id80f956ffe75bc72b2ae6e523f4d1d099908a751