Supporting case insensitive search. Clean up buttons.