Refactored code into services
working functions
enchancing UI