Made some changes

Made some changes but program page and service-opportunities page are
not completed