Changes for making the expandable view and modifying the service