Url prettifying, some minor content changes