Stable build, working screens with nav redesign