Change Service Labels
Change Search input to allow edits
Fixes #24 and some refactoring