Minor fix.
Nav size adaptation
Several things.