more border-radius cleanup