Move navbar into it's own module and add a test for sorter.