Nothingness, with slight bugfix for search/navigation panel
fixed merge conflict
blahlab