Making navigate clear buttons work. Fixes #1