I'm in favour of that first idea. Just a small link with a pop-up list would be really cool, and look much better. I've no idea how hard that is to implement though.

So failing that, the second...