Better Nav Walker and started filling in the layout a bit more