[TASK] Adjust navigation to new design