Little cleanup
Refactor fix
Remove service button
Add xMatch service
Modify service manager layout