Updated Navigator formatting