added navigation features