Reworked nav