fix service and btn