refactored
services added
Service refactored and Dashboard added