Added navigation list.
Clean up.