Rework of services page