I upgraded with the leaked 2.1 yesterday but have a couple of things that came up that I haven't seen before and was wondering if anyone knows a fix.

1. In Handcent when I want to compose a new text message it shows all of my Facebook contacts instead of just my phone contacts. It didn't do this before but now whenever I want to select a number to send my text to I have to scroll through a bunch of people who have mobile numbers listed for on their Facebook profiles. Is there a way to keep it from doing this?

2. The friend widget now has small gaps in between each row of three. This causes the third row to have their names off the screen and you have to scroll down to see them. I've tried removing the widget and adding it again but it just keeps doing the same thing. Anyone else notice this?