Makes Search a little nicer on menu

Completes todos #44, #36.