City and Water: Re-shaping Urban Waterfronts