closed #23: Fix Navigation List