Removed inactive icons. Renamed services where appropriate