More updates and working nav