More layout tweaks and base search working, sort of...