changed client server urls and refactored urls in html templates