Minor updates to NavBar and TableRow.