changed urls to reflect new naming and added control