MS420: Use proxy if specified

Also corrected layout, sorry about that