Nav-button updated.. nearly working as it should!