changes in services
style added as per design
conflicts removed