Fix table showing
Better nav