updated services and fixed buttons [ci skip]