Fix and implement a few things around nav