Ticket 1 - Fixed Service delete and sorting
Fix merge conflicts