Adding in service disconnection. Tweaks to layout of service buttons.