Work a bit on the navigation and filters