Added navigation with association editing.