Better icons
Moved services that run everywhere to top