Folders / Shortcuts Questions

[Needsdecaf]

Couple of questions:

I have created two folders on my home screen, one for browser bookmark shortcuts, the other for speed dial short cuts.

For the speed dial shortcuts, I would like to have multiple shortcuts for one person for each numbers; e.g. the cell and work numbers for the wife. However, when I create the shortcut, it doesn't give me any opportunity to re-name them. Any way to do that?

Also, when they are in the folder, is there any way to move them around in the folder? I have astro file manager, but I can't find the folder where the shortcuts are!

Thanks.