Changed services to have border around