Adding some search tools for fun
Make navigation state work sometimes with pluggable buttons (issue #547)