fixed navbutton and updated lists