more work on the new service layout