Toolbar items now populated correctly when going to/from jump page.