small fixes in buttons and service context implementation is fixed to work correclty