Hide elements in navigation
Cleanup
Fix conflict search