Updated routes and navigation to enhance 'active' css