Fix some urls and padding