fixed pending service bug and modified UI