added viewport, fixed urls