Added countries list; Small layout changes

- Refactored Services