Improve the search page's layout.

Also, the search code uses IDs instead of names, so it should be more robust.