3.0.1 - Fix navigation issue, fix constructor ordering issue

Fixes an issue with navigation where the wrong item was active upon return from menu.
Fixes a constructor order issue in 3.0.0 that caused a compiler warning that some treat as an error.